| commit | 7bf20a74c902b7601da7d810529daee5a1aaf81b | |
| author | Bjorn Winckler <bjorn.winckler@gmail.com> | |
| Fri, 9 Oct 2009 20:35:33 +0000 (9 22:35 +0200) | ||
| committer | Bjorn Winckler <bjorn.winckler@gmail.com> | |
| Fri, 9 Oct 2009 20:35:33 +0000 (9 22:35 +0200) | ||
| tree | 23a22a6a2fda29565803d67aad556f007aa2e7ac | treesnapshot (tar.gz zip) |
| parent | 8eae8ea15558b3479701b51e074d205da108f869 | commitdiff |
| parent | 95f0a4bd554ebda58f1362ef19f76ea8ac3f97df | commitdiff |
Merge branch 'vim'
Conflicts:
runtime/doc/options.txt
runtime/syntax/vim.vim
src/auto/configure
Conflicts:
runtime/doc/options.txt
runtime/syntax/vim.vim
src/auto/configure
17 files changed: