Merge branch 'vim-with-runtime' into feat/persistent-undo
commitcc323e76be4bda5271748be93673b112047f9c04
authorMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 7 May 2010 18:59:34 +0000 (7 20:59 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 7 May 2010 18:59:34 +0000 (7 20:59 +0200)
tree685e82f40661bda9338c546b48a5c5ea3085fad2
parent4cf978e64588b3475d8c03b6771ed5bd4d3d8374
parentb9869caa8c5075081c160da13b6f26fbf512b618
Merge branch 'vim-with-runtime' into feat/persistent-undo
src/main.c
src/version.c