Public Git Hosting - MacVim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 0154dff 62c86d5)

commit	7eea6da734cace02ba5de4bf4b6a56b4c167907d
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 21 Jun 2008 18:49:16 +0000 (21 20:49 +0200)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 21 Jun 2008 18:49:16 +0000 (21 20:49 +0200)
tree	e2ac3081319d226842b2b592c56bbe4f016e565c	tree \| snapshot (tar.gz zip)
parent	0154dff18258c532c6a4acdc990ffa6ace6310ec	commit \| diff
parent	62c86d546c0eb155fa7cbadabb0ed70fb44540c4	commit \| diff

Merge branch 'vim'

Conflicts:

runtime/doc/gui.txt
runtime/doc/various.txt

12 files changed:

runtime/doc/eval.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/gui.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
runtime/menu.vim	diff1 \|	diff2 \|	blob \| history
src/Makefile	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/ex_docmd.c	diff1 \|	diff2 \|	blob \| history
src/ex_getln.c	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/version.c	diff1 \|	diff2 \|	blob \| history

Vim for the Mac