Merged from the latest developing branch.
commit10ad19efc19e9f36ca9c7785b97c3de260c20e71
authoredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Tue, 10 Jun 2008 05:46:41 +0000 (10 05:46 +0000)
committeredyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Tue, 10 Jun 2008 05:46:41 +0000 (10 05:46 +0000)
treea5fdeffd50fd2b7946fbcdb9b342463a11f5f162
parentcea4ab3f781cf070d571d8684af2a10fbd4cac1a
Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1043 2a77ed30-b011-0410-a7ad-c7884a0aa172
src/netbeans.c
src/option.c
src/po/check.vim
src/version.c