Merge branch 'vim-with-runtime' into feat/rel-line-numbers
commitc78d18f4c7cc6cbfe60ff364e88af666ef062332
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 13 May 2010 22:10:13 +0000 (14 00:10 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 13 May 2010 22:10:13 +0000 (14 00:10 +0200)
tree40b329a9d032dfc9ae0dc29ccc251b26b2dfd25b
parentc9bc930d6e176666d398954daa3259112e734a31
parentc2eac67ff505744a066fccd38e7dd430ae8fae67
Merge branch 'vim-with-runtime' into feat/rel-line-numbers
src/normal.c
src/option.c