Merged from the latest developing branch.
commit21eb265ccf92726f47daefc1584104dba5c51201
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 12 Mar 2008 14:19:01 +0000 (12 14:19 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Wed, 12 Mar 2008 14:19:01 +0000 (12 14:19 +0000)
tree8590e59d945f0204bfb7370b96001d48ab1afee6
parentc2f071c724a1fc83533a95275b503b7e991451d0
Merged from the latest developing branch.

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