Merge branch 'vim-with-runtime'
authorMarkus Heidelberg <markus.heidelberg@web.de>
Mon, 7 Jun 2010 15:08:11 +0000 (7 17:08 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Mon, 7 Jun 2010 15:08:11 +0000 (7 17:08 +0200)
1  2 
src/option.c
src/version.c

diff --cc src/option.c
Simple merge
diff --cc src/version.c
Simple merge