Merged from the latest developing branch.
commitd6f50fa5b87c515a5d775528ab7cc40289ad03a2
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 10 Sep 2008 23:41:08 +0000 (10 23:41 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 10 Sep 2008 23:41:08 +0000 (10 23:41 +0000)
tree10036af82fea5bfe201684ea0c85e3fced45ffa0
parent35b16e114e86a6d642e177ed15660fcf76bf556b
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1190 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/testdir/Makefile
src/version.c