Merge branch 'vim' into feat/var-tabstops
commit68922241078da4c19b3c66b11103fe79b32499bb
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 11 Feb 2010 22:00:55 +0000 (11 23:00 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 11 Feb 2010 22:00:55 +0000 (11 23:00 +0100)
treea73df4c421d1dca9a20773555b5872d4ffaf4d1a
parent8d9fe872d731d0ab17bec75f2432db7b18124a7f
parent13986c43a31453f2f3308c95e5c8ea9e018bf736
Merge branch 'vim' into feat/var-tabstops
src/option.c
src/version.c