Merge branch 'vim-with-runtime' into feat/var-tabstops
commit9ce76744f508b6bc3ec9546aff0d19d2040e891d
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 13 May 2010 22:10:15 +0000 (14 00:10 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 13 May 2010 22:10:15 +0000 (14 00:10 +0200)
tree2ca8ba90f0a6cea547386e0cc3f0418da641ab9d
parent6230253be152c3f39aab71c67cb893f37dd8fb28
parentc2eac67ff505744a066fccd38e7dd430ae8fae67
Merge branch 'vim-with-runtime' into feat/var-tabstops
src/option.c
src/version.c