Merge branch 'vim' into feat/lua
commit5c5cb24f81f0275410025df1d80055210a719ad4
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 11 Feb 2010 22:00:47 +0000 (11 23:00 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 11 Feb 2010 22:00:47 +0000 (11 23:00 +0100)
treea6dbdb1aac4dfe81ab08649e5d494ded999d19ca
parent8ca651366982e303221bd45255c5f591d2d55a36
parent13986c43a31453f2f3308c95e5c8ea9e018bf736
Merge branch 'vim' into feat/lua
src/version.c