Public Git Hosting - MacVim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 869b2b8 e7ed0f6)

commit	1655656fe7a2a1b9de0cb4385deb8c67641509d6
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Fri, 26 Sep 2008 18:08:11 +0000 (26 20:08 +0200)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Fri, 26 Sep 2008 18:08:11 +0000 (26 20:08 +0200)
tree	448581dc3d4332191072ace83a13fa512346a370	tree \| snapshot (tar.gz zip)
parent	869b2b80c449862d9243eceebf9e93b62ce08497	commit \| diff
parent	e7ed0f6d06e04c680ef46446c5df3d82ae2ac2a5	commit \| diff

Merge branch 'vim' into master

Conflicts:

runtime/doc/options.txt
runtime/doc/tags

22 files changed:

runtime/doc/eval.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/gui.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/help.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/index.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/options.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
runtime/menu.vim	diff1 \|	diff2 \|	blob \| history
runtime/syntax/vim.vim	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/ex_cmds.h	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/fileio.c	diff1 \|	diff2 \|	blob \| history
src/globals.h	diff1 \|	diff2 \|	blob \| history
src/main.c	diff1 \|	diff2 \|	blob \| history
src/normal.c	diff1 \|	diff2 \|	blob \| history
src/ui.c	diff1 \|	diff2 \|	blob \| history
src/version.c	diff1 \|	diff2 \|	blob \| history

Vim for the Mac