Merge branch 'vim' into feat/lua
commit20629e8c83fb948287588217fadbedf12cc36422
authorMarkus Heidelberg <markus.heidelberg@web.de>
Tue, 19 Jan 2010 22:51:42 +0000 (19 23:51 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Tue, 19 Jan 2010 22:51:42 +0000 (19 23:51 +0100)
treef15ec154ff30f2053909a1266f4bf98ede9429ae
parentbf5ee825f9d0022cfa01e3ba6e2622200f4b17b1
parente78ebb35fbc0be889e85604e5741cd29cefd6edd
Merge branch 'vim' into feat/lua
src/version.c