| commit | 3862b21fbf42dfcb5c200a464ec7395637b09bc1 | |
| author | Bjorn Winckler <bjorn.winckler@gmail.com> | |
| Sun, 28 Dec 2008 16:00:37 +0000 (28 17:00 +0100) | ||
| committer | Bjorn Winckler <bjorn.winckler@gmail.com> | |
| Sun, 28 Dec 2008 16:00:37 +0000 (28 17:00 +0100) | ||
| tree | 37454ab192740c2ab03df3f40ea1d12a0cb28233 | treesnapshot (tar.gz zip) |
| parent | 3da5ed18fc4041009b21bb6c3fe4fbf6e3ad8d93 | commitdiff |
| parent | 0052630474dd64093f9ab835dc9f7e2a38eb58f3 | commitdiff |
Merge branch 'vim'
Conflicts:
runtime/doc/options.txt
runtime/syntax/vim.vim
Conflicts:
runtime/doc/options.txt
runtime/syntax/vim.vim
17 files changed: