Merged from the latest developing branch.
commitafe88860ef5bd37ab802409c4b9870044e8864e7
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 19 Jan 2008 02:31:21 +0000 (19 02:31 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sat, 19 Jan 2008 02:31:21 +0000 (19 02:31 +0000)
tree590772089335846ddde7c138c535b971eb8bde77
parent9c956197f44e0ce79a55319fbf84f61de0eacee0
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@838 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/diff.c
src/ex_cmds2.c
src/ex_getln.c
src/netbeans.c
src/regexp.c
src/version.c