Merged from the latest developing branch.
commitf9f9e929c41556fff70018a9b87072bab4fc0b2b
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Tue, 12 Jan 2010 11:54:23 +0000 (12 11:54 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Tue, 12 Jan 2010 11:54:23 +0000 (12 11:54 +0000)
treeb5cb391ceddb4c35d503aa233a942c68f7ca4f14
parent6bb3a19354fae270dd5ca0c3d60b204de7e8bcb1
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1714 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/integration.c
src/misc1.c
src/version.c
src/workshop.c