| commit | 913091f59f5758b1318e277e9b54cec76937de65 | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sun, 17 May 2009 22:43:50 +0000 (18 00:43 +0200) | ||
| committer | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sun, 17 May 2009 22:43:50 +0000 (18 00:43 +0200) | ||
| tree | 1412eacb4a3a7e7b6e1e6255668ae2f5dee865dd | treesnapshot (tar.gz zip) |
| parent | a92570db8c9411f5f2c05c15fddbc211452c9ef4 | commitdiff |
| parent | a59b0775a744ac375f6fb7eb8ac897dffb972e48 | commitdiff |
Merge branch 'vim' into feat/rel-line-numbers
Conflicts:
src/option.c
Conflicts:
src/option.c