Merged from the latest developing branch.
commitca2ed8d2a80522a5e010dd8888548c0cb2bd0aff
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Fri, 4 Jan 2008 12:38:53 +0000 (4 12:38 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Fri, 4 Jan 2008 12:38:53 +0000 (4 12:38 +0000)
treedc1e768b8862f1df971f9d65b5943c2da616ade0
parent83881bbf93e9b9c197b31eb7d643613edd888092
Merged from the latest developing branch.

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