Merged from the latest developing branch.
commitc316268c5873d22d3372d3a285da35c88e511a98
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sun, 16 Mar 2008 11:47:42 +0000 (16 11:47 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Sun, 16 Mar 2008 11:47:42 +0000 (16 11:47 +0000)
treefbfc4aa45201cbbb48a698f45a18e1abe299d7d0
parent236dfa65e623c9d3808b9092ed6e1079fbeb1633
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@966 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/if_cscope.c
src/version.c
src/vim.h