Merge branch 'vim' into feat/lua
commit714b30e40d308ae5d56ef4c3b71e942e2572f521
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 16 Dec 2009 19:46:57 +0000 (16 20:46 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 16 Dec 2009 19:46:57 +0000 (16 20:46 +0100)
treee85e6591a343abbc4f43309573e36116bb23f5bd
parent9b044cfd44452d58622a095272a698333abf2e64
parentd4e581426f7a53b252351b51c3163084302c6fd8
Merge branch 'vim' into feat/lua
src/auto/configure
src/configure.in
src/main.c
src/version.c