Merged from the latest developing branch.
commit7aba201d8cbd649daf2fa7d0dcc5885edf03018c
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Mon, 31 Dec 2007 15:58:34 +0000 (31 15:58 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Mon, 31 Dec 2007 15:58:34 +0000 (31 15:58 +0000)
tree1af6c92b26158568056256253bee8f5377f1449d
parentfb64e35094dae62518ad0288875b72c945c2eb39
Merged from the latest developing branch.

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