Merge branch 'vim-with-runtime' into feat/persistent-undo
commit54e87dae6f94cc53b82155991bafd517298d3f38
authorMarkus Heidelberg <markus.heidelberg@web.de>
Mon, 7 Jun 2010 15:08:08 +0000 (7 17:08 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Mon, 7 Jun 2010 15:08:08 +0000 (7 17:08 +0200)
tree7614b30b5fe578c929859c326a45c38ad8d9ce4f
parent0cf3e872804a429d19541259e98fd94a1be90b25
parente8b1068c8c645d683696325a01a90865898e60b4
Merge branch 'vim-with-runtime' into feat/persistent-undo
src/option.c
src/version.c