Merge branch 'vim' into master
commitf9d77c2696a1f78fc7b7ecda037c7612c0ffe982
authorBjorn Winckler <bjorn.winckler@gmail.com>
Wed, 16 Jul 2008 13:46:37 +0000 (16 15:46 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Wed, 16 Jul 2008 13:46:37 +0000 (16 15:46 +0200)
treecc047bece06653555d5046c71d5db957fda4105f
parent6e46061e9354b7b3d325d27a60c9901b732370d5
parent3232f25110f05f299783dc4df9d01115ee3eaf49
Merge branch 'vim' into master

Conflicts:

runtime/doc/index.txt
runtime/doc/os_mac.txt
26 files changed:
runtime/doc/eval.txt
runtime/doc/gui.txt
runtime/doc/gui_x11.txt
runtime/doc/help.txt
runtime/doc/index.txt
runtime/doc/options.txt
runtime/doc/os_mac.txt
runtime/doc/quickref.txt
runtime/doc/remote.txt
runtime/doc/starting.txt
runtime/doc/syntax.txt
runtime/doc/tags
runtime/doc/various.txt
runtime/doc/version7.txt
runtime/syntax/vim.vim
src/Makefile
src/configure.in
src/eval.c
src/ex_docmd.c
src/fileio.c
src/gui.c
src/main.c
src/option.c
src/ui.c
src/version.c
src/vim.h