Public Git Hosting - MacVim.git/commit

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

commit	42335ab8d8b7d29fc8b09220264b3d15c61e02c4
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	89276e8fb067674bd4ccd26b42e6b4ba477aa1ff	tree \| snapshot (tar.gz zip)
parent	1fafaf1a3da621b266083f178d3634cf0c6962bf	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