| commit | 72e4bbcdf287492ac72315429933cdfc82321db2 | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Thu, 5 Feb 2009 20:51:17 +0000 (5 21:51 +0100) | ||
| committer | Markus Heidelberg <markus.heidelberg@web.de> | |
| Thu, 5 Feb 2009 20:51:17 +0000 (5 21:51 +0100) | ||
| tree | 7d809ebbaffd6146c153f38abe04a5ba83e81ff3 | treesnapshot (tar.gz zip) |
| parent | 0a390f9ab56c25ec566e18221fef080c96ff4eac | commitdiff |
| parent | b736936c62fcc82757c0f4c0c19da980b7b29a63 | commitdiff |
Merge commit 'vim_mainline/vim' into feat/rel-line-numbers
Conflicts:
src/normal.c
Conflicts:
src/normal.c
| src/edit.c | diff1 | diff2 | blobhistory |
| src/ex_cmds.c | diff1 | diff2 | blobhistory |
| src/normal.c | diff1 | diff2 | blobhistory |
| src/option.c | diff1 | diff2 | blobhistory |