Merge branch 'vim-with-runtime' into feat/var-tabstops
commit45311df6d1c557cb22933834507f966c86551d8a
authorMarkus Heidelberg <markus.heidelberg@web.de>
Mon, 7 Jun 2010 15:08:10 +0000 (7 17:08 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Mon, 7 Jun 2010 15:08:10 +0000 (7 17:08 +0200)
treee0433ab7a1d1562307c70b6f00ebff9844ffcc77
parent895d598f51d9b38339ae31cb5003fe00547080c4
parente8b1068c8c645d683696325a01a90865898e60b4
Merge branch 'vim-with-runtime' into feat/var-tabstops
src/option.c
src/version.c