Merge branch 'vim'
commit2adfdae3529e977cf0c97b2f268b1221dd4e163f
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 22 Mar 2009 11:46:18 +0000 (22 12:46 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 22 Mar 2009 11:46:18 +0000 (22 12:46 +0100)
tree52c1e2976016d8b0699aee91b35261342347fd3a
parentff3cc6d23ce8ff2434bdca0f0dc399b31d509ebb
parent14c903067b14ef4bc74df3e34b2050e44cb6688d
Merge branch 'vim'

Conflicts:
src/vim.h
src/ex_docmd.c
src/ex_getln.c
src/fileio.c
src/option.c
src/version.c
src/vim.h