| commit | a41af4f07a84af46976c17b32c1b23f6cd34ff2a | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sat, 12 Sep 2009 09:33:02 +0000 (12 11:33 +0200) | ||
| committer | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sat, 12 Sep 2009 09:33:02 +0000 (12 11:33 +0200) | ||
| tree | 3267bbf3ff083c82d7c44c8e8f1d5325baac0f11 | treesnapshot (tar.gz zip) |
| parent | bbadf08fa25661bc6b8aff1afb4fb75860287464 | commitdiff |
| parent | ed974bb732fc4765169efe12e7d8247cbb19aa4b | commitdiff |
Merge branch 'vim' into feat/indent-wrap-lines
Conflicts:
src/ui.c
Caused by commit aa1334b ([7.2.258] v:beval_col and b:beval_text are
wrong in UTF-8 text. (Tony)
Conflicts:
src/ui.c
Caused by commit aa1334b ([7.2.258] v:beval_col and b:beval_text are
wrong in UTF-8 text. (Tony)
| src/charset.c | diff1 | diff2 | blobhistory |
| src/option.c | diff1 | diff2 | blobhistory |
| src/ui.c | diff1 | diff2 | blobhistory |