Merge branch 'vim' into feat/persistent-undo
commit682ede101d0c7ed5ca8763faf1326fd06aceaa49
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 11 Feb 2010 22:00:50 +0000 (11 23:00 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 11 Feb 2010 22:00:50 +0000 (11 23:00 +0100)
tree9ce24be3a605d2da9e8a0852d9d1c5191c70e96d
parent8d75e94962a2302365e1c3109a987be9ba1c4be5
parent13986c43a31453f2f3308c95e5c8ea9e018bf736
Merge branch 'vim' into feat/persistent-undo
src/memline.c
src/option.c
src/version.c