Public Git Hosting - MacVim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: fd81fe3 6e2bb5b)

commit	c0df718393220cf06829a4e3b576d521f8223716
author	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sun, 10 Aug 2008 13:46:37 +0000 (10 15:46 +0200)
committer	Bjorn Winckler <bjorn.winckler@gmail.com>
	Sun, 10 Aug 2008 13:46:37 +0000 (10 15:46 +0200)
tree	80e3e9e754e2cf36a205823431a8b339b48b72e7	tree \| snapshot (tar.gz zip)
parent	fd81fe32abfb66228c0b04171046c85afadd5221	commit \| diff
parent	6e2bb5b999579b2e2f9709ae1cb711208da7afe7	commit \| diff

Merge branch 'vim' (version 7.2)

Conflicts:

runtime/doc/os_mac.txt
runtime/syntax/vim.vim

29 files changed:

runtime/doc/eval.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/gui.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/gui_x11.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/os_mac.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/quickref.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/remote.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/various.txt	diff1 \|	diff2 \|	blob \| history
runtime/doc/version7.txt	diff1 \|	diff2 \|	blob \| history
runtime/syntax/vim.vim	diff1 \|	diff2 \|	blob \| history
src/Makefile	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/ex_getln.c	diff1 \|	diff2 \|	blob \| history
src/feature.h	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/gui.c	diff1 \|	diff2 \|	blob \| history
src/if_xcmdsrv.c	diff1 \|	diff2 \|	blob \| history
src/normal.c	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