Public Git Hosting - MacVim/KaoriYa.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: a6aa888 7c44997)

commit	def2f44a332b8acb882b75e430bacad14dbb1e78
author	Kazuki Sakamoto <sakamoto@splhack.org>
	Sat, 21 Nov 2009 00:45:59 +0000 (21 09:45 +0900)
committer	Kazuki Sakamoto <sakamoto@splhack.org>
	Sat, 21 Nov 2009 00:45:59 +0000 (21 09:45 +0900)
tree	e2b9473b1e4a1d2ae61e6a53cf4527c1d95489e2	tree \| snapshot (tar.gz zip)
parent	a6aa88839da8df46aacf886e38d17dcc415d681d	commit \| diff
parent	7c449976c5991adf959488d159372b3cc9863742	commit \| diff

Merge branch 'KaoriYa'

Conflicts:
src/MacVim/English.lproj/Preferences.nib/classes.nib
src/MacVim/English.lproj/Preferences.nib/info.nib
src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib

MacVim KaoriYa