Public Git Hosting - MacVim/KaoriYa.git/commit

commit	352feb986c3be9d84df02016f58bae9fcc10d23b
author	Kazuki Sakamoto <sakamoto@splhack.org>
	Mon, 30 Nov 2009 03:19:27 +0000 (30 12:19 +0900)
committer	Kazuki Sakamoto <sakamoto@splhack.org>
	Mon, 30 Nov 2009 03:19:27 +0000 (30 12:19 +0900)
tree	95ff331bee5ab1d4591c3bec93c75fc5be3c7611	tree \| snapshot (tar.gz zip)
parent	b8f4a19b827c67d14b1417a7808413bdcaf5a9c1	commit \| diff
parent	13523169eba87a0eb297843c02777a0ee23d0d32	commit \| diff

Merge branch 'KaoriYa'

Conflicts:
src/MacVim/English.lproj/Preferences.nib/designable.nib
src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib