Merged from the latest developing branch.
commit6a29276ee87c6a6c820152452caeb350de76ce8f
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Fri, 23 Jan 2009 05:59:03 +0000 (23 05:59 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Fri, 23 Jan 2009 05:59:03 +0000 (23 05:59 +0000)
treeb6868558b76d48ef4afd3bbb688b291f2ff6c376
parent20a07afe4b5a0862ecf6f30982471dd58c575827
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1331 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/diff.c
src/misc2.c
src/os_mswin.c
src/term.c
src/version.c