Public Git Hosting - MacVim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 62812a5 907e210)

commit	59f419311eaed666006dbb10bd1924a60141d9f1
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 17 Jan 2009 20:08:44 +0000 (17 21:08 +0100)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 17 Jan 2009 20:08:44 +0000 (17 21:08 +0100)
tree	a227eb19c6df6292e64bb16e42f48a03634e852c	tree \| snapshot (tar.gz zip)
parent	62812a5f3aee2714046da50bce4c6cef7d09084c	commit \| diff
parent	907e210b6b4163d95baac210323fb0b954d74719	commit \| diff

Merge branch 'vim'

Conflicts:

src/buffer.c

runtime/doc/eval.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/starting.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/syntax.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/tags	diff1 \|	diff2 \|	blob \| history
runtime/doc/version7.txt	diff1 \|	diff2 \|	blob \| history
runtime/syntax/vim.vim	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/globals.h	diff1 \|	diff2 \|	blob \| history
src/version.c	diff1 \|	diff2 \|	blob \| history

Vim for the Mac