Merge branch 'vim'
commit96b5744e2f5f15ab5a66146b3cdff29dd3e6d83a
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 7 Jun 2008 13:03:11 +0000 (7 15:03 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sat, 7 Jun 2008 13:03:11 +0000 (7 15:03 +0200)
tree78c48bda4506be4798aa5f87b8cb4d28235fa4f4
parentdd15c1a46515b3213371811985948ce54f17493f
parent216f4d038c6ecf29e8fbbad336eb74d24a84bdb4
Merge branch 'vim'

Conflicts:

runtime/doc/options.txt
runtime/doc/remote.txt
runtime/doc/eval.txt
runtime/doc/options.txt
runtime/doc/remote.txt
runtime/doc/syntax.txt
runtime/doc/tags
runtime/menu.vim
runtime/optwin.vim
src/Makefile
src/fileio.c
src/version.c