Public Git Hosting - MacVim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: eee0fee e7b5cc0)

commit	4167ff8533bbadbee5178d920d8296d43f1623b4
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Mon, 21 Jan 2008 21:36:08 +0000 (21 22:36 +0100)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Mon, 21 Jan 2008 21:36:08 +0000 (21 22:36 +0100)
tree	f4cbba3aedfd041b8cb2bf37bcbf5007fc04285a	tree \| snapshot (tar.gz zip)
parent	eee0fee5209d2941c0af19ae5ccb787737e36580	commit \| diff
parent	e7b5cc0556b15045657dccf840ba6eb37456fe57	commit \| diff

Merge commit 'svn-vim'

Conflicts:

runtime/doc/eval.txt
runtime/doc/various.txt

20 files changed:

runtime/doc/eval.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/options.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/various.txt	diff1 \|	diff2 \|	blob \| history
src/Makefile	diff1 \|	diff2 \|	blob \| history
src/configure.in	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/fileio.c	diff1 \|	diff2 \|	blob \| history
src/globals.h	diff1 \|	diff2 \|	blob \| history
src/gui.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/option.h	diff1 \|	diff2 \|	blob \| history
src/os_unix.c	diff1 \|	diff2 \|	blob \| history
src/structs.h	diff1 \|	diff2 \|	blob \| history
src/syntax.c	diff1 \|	diff2 \|	blob \| history
src/version.c	diff1 \|	diff2 \|	blob \| history
src/vim.h	diff1 \|	diff2 \|	blob \| history

Vim for the Mac