Merge branch 'vim'
commitcfdbbc74d9673359d1dafe2936834e74113b1fe6
authorBjorn Winckler <bjorn.winckler@gmail.com>
Fri, 20 Feb 2009 12:42:57 +0000 (20 13:42 +0100)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Fri, 20 Feb 2009 12:42:57 +0000 (20 13:42 +0100)
tree34c206179f53825720fb156592560ecb2e79bcdb
parentb39aa0558b7811ea3069dddb35218f505f8ecbd6
parentb0e622fec47ec3bbd6a125413d7a41b58233a471
Merge branch 'vim'
runtime/doc/options.txt
src/option.c
src/version.c