Merge branch 'vim' into feat/lua
commitef534aecc6eb1a55081053ee4a3f7e4d5161af71
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 18 Feb 2010 20:50:26 +0000 (18 21:50 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 18 Feb 2010 20:50:26 +0000 (18 21:50 +0100)
treea120c074ffdb780a1ccb9887071b1a18cec8671d
parentb0af5d1951d1e540364c5c5cd5a297ba66c9930c
parentd9a047020fdd388c99cf718772a814d2ed204ad5
Merge branch 'vim' into feat/lua
src/version.c