Public Git Hosting - MacVim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: ff04cce 215e29b)

commit	d6f3083143bb26ebaf8fa69dbba7cd355fd2ef85
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Mon, 10 Nov 2008 20:29:04 +0000 (10 21:29 +0100)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Mon, 10 Nov 2008 20:29:04 +0000 (10 21:29 +0100)
tree	3f6ddbf7bddff8877616f863f73669a0830c4dc3	tree \| snapshot (tar.gz zip)
parent	ff04cce4f5c193c93619060f5209bafc3daeb2db	commit \| diff
parent	215e29b304c7f50e8ca31308086910583be0fba8	commit \| diff

Merge branch 'vim'

Conflicts:

src/feature.h

18 files changed:

runtime/doc/eval.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/gui.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/options.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/starting.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/syntax.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/tags	diff1 \|	diff2 \|	blob \| history
runtime/doc/various.txt	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/ex_cmds.h	diff1 \|	diff2 \|	blob \| history
src/ex_docmd.c	diff1 \|	diff2 \|	blob \| history
src/feature.h	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/normal.c	diff1 \|	diff2 \|	blob \| history
src/option.c	diff1 \|	diff2 \|	blob \| history
src/structs.h	diff1 \|	diff2 \|	blob \| history
src/version.c	diff1 \|	diff2 \|	blob \| history
src/vim.h	diff1 \|	diff2 \|	blob \| history

Vim for the Mac