Public Git Hosting - MacVim/KaoriYa.git/commit

commit	e721a38db0167f9d2d161990df94db9e5b3b0bce
author	Kazuki Sakamoto <sakamoto@splhack.org>
	Mon, 31 Aug 2009 02:07:12 +0000 (31 11:07 +0900)
committer	Kazuki Sakamoto <sakamoto@splhack.org>
	Mon, 31 Aug 2009 02:07:12 +0000 (31 11:07 +0900)
tree	00b8ef21520d77cb1f1b3cec37c1622bc2d9073e	tree \| snapshot (tar.gz zip)
parent	955e401213a9b8591d466b65cd51a9fc9390f545	commit \| diff
parent	5ecd395bad9efe88aaf45bfb36813fe3de946752	commit \| diff

Merge branch 'KaoriYa'

Conflicts:
runtime/menu.vim
src/MacVim/English.lproj/FindAndReplace.nib/classes.nib
src/MacVim/FindAndReplace.nib/classes.nib
src/MacVim/Japanese.lproj/Preferences.nib/classes.nib
src/MacVim/MacVim.xcodeproj/project.pbxproj
src/MacVim/edit-in-odb/src/Edit in ODBEditor.mm
src/MacVim/gui_macvim.m
src/MacVim/gvimrc
src/MacVim/vimrc
src/configure

MacVim KaoriYa

RSS Atom

runtime/lang/menu_ja_jp.utf-8.macvim.vim	diff1 \|	\|	blob \| history
src/MacVim/MacVim.xcodeproj/project.pbxproj	diff1 \|	diff2 \|	blob \| history
src/MacVim/edit-in-odb/Edit in ODBEditor.xcodeproj/project.pbxproj	diff1 \|	diff2 \|	blob \| history
src/MacVim/gui_macvim.m	diff1 \|	diff2 \|	blob \| history
src/MacVim/gvimrc	diff1 \|	diff2 \|	blob \| history
src/MacVim/vimrc	diff1 \|	diff2 \|	blob \| history
src/configure.in	diff1 \|	diff2 \|	blob \| history
src/menu.c	diff1 \|	diff2 \|	blob \| history
src/proto/gui_macvim.pro	diff1 \|	diff2 \|	blob \| history