Merged from the latest developing branch.
commitd28ecd0d2b89e69012b4c67812ed8db336f54389
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 4 Jun 2008 17:14:04 +0000 (4 17:14 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 4 Jun 2008 17:14:04 +0000 (4 17:14 +0000)
tree6cc032e7cfe24dc281aa6fb8a03efe499f4273b0
parent20f10e38e2fab46249b61e4f865df731090e4738
Merged from the latest developing branch.

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