Public Git Hosting - MacVim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d9f079a ad56d20)

commit	1006d615d02ce8b50ce47ef5cdc77d73e876b596
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 27 Mar 2010 17:16:50 +0000 (27 18:16 +0100)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sat, 27 Mar 2010 17:16:50 +0000 (27 18:16 +0100)
tree	a65ee4d03456b094c07810cc1c2166d2944f1575	tree \| snapshot (tar.gz zip)
parent	d9f079a730c98ffa28cd9f4874c6ab268b61e6c4	commit \| diff
parent	ad56d20f93afd23c9d096247f6af7f9532cf8bcb	commit \| diff

Merge branch 'vim'

Conflicts:
src/auto/configure
src/configure.in
src/if_ruby.c
src/vim.h

21 files changed:

src/auto/configure	diff1 \|	diff2 \|	blob \| history
src/configure	diff1 \|	diff2 \|	blob \| history
src/configure.in	diff1 \|	diff2 \|	blob \| history
src/edit.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	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/if_python.c	diff1 \|	diff2 \|	blob \| history
src/if_ruby.c	diff1 \|	diff2 \|	blob \| history
src/if_xcmdsrv.c	diff1 \|	diff2 \|	blob \| history
src/misc1.c	diff1 \|	diff2 \|	blob \| history
src/netbeans.c	diff1 \|	diff2 \|	blob \| history
src/normal.c	diff1 \|	diff2 \|	blob \| history
src/screen.c	diff1 \|	diff2 \|	blob \| history
src/syntax.c	diff1 \|	diff2 \|	blob \| history
src/ui.c	diff1 \|	diff2 \|	blob \| history
src/version.c	diff1 \|	diff2 \|	blob \| history
src/vim.h	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history

Vim for the Mac