Merge branch 'vim'
authorBjorn Winckler <bjorn.winckler@gmail.com>
Mon, 1 Mar 2010 18:32:44 +0000 (19:32 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Mon, 1 Mar 2010 18:32:44 +0000 (19:32 +0100)
commit595a0ac2b9cc9005c2ffb87bff7eb69527941e57
tree9f07d0c15cdc163bc97b4b46da21f08f71d0b65a
parent346ebb12737ca99493016de96f0c1fad3ad9ac46
parentc3db9d0ebcf6e7155a89d0c7f6194a0c4ff624de
Merge branch 'vim'

Conflicts:
src/auto/configure
src/eval.c
src/if_ruby.c
13 files changed:
src/Makefile
src/auto/configure
src/buffer.c
src/configure.in
src/eval.c
src/ex_cmds2.c
src/if_ruby.c
src/option.c
src/option.h
src/os_unix.c
src/syntax.c
src/version.c
src/vim.h