Public Git Hosting - MacVim.git/commit

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

commit	78442e9e56ccf64da1b02367d24adb8bca37f4c1
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 13 Feb 2010 23:49:42 +0000 (14 00:49 +0100)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 13 Feb 2010 23:49:42 +0000 (14 00:49 +0100)
tree	25772f8227318ab9a090619afe6938f309a52f25	tree \| snapshot (tar.gz zip)
parent	1a551d4321b8f3fc66149442cff3c539fbc1f9f4	commit \| diff
parent	c7a257d9e17d935c4a3d355345ba14bcf418f498	commit \| diff

Merge branch 'vim'

Conflicts:
src/vim.h

runtime/doc/eval.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/starting.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/tags	diff1 \|	diff2 \|	blob \| history
runtime/doc/version7.txt	diff1 \|	diff2 \|	blob \| history
src/ex_cmds2.c	diff1 \|	diff2 \|	blob \| history
src/ex_docmd.c	diff1 \|	diff2 \|	blob \| history
src/ex_getln.c	diff1 \|	diff2 \|	blob \| history
src/screen.c	diff1 \|	diff2 \|	blob \| history
src/version.c	diff1 \|	diff2 \|	blob \| history
src/vim.h	diff1 \|	diff2 \|	blob \| history

Vim for the Mac