Merge branch 'work/KaoriYa' into KaoriYa
commit787d724517de0b609183323ed0c9fbaed2d0fe43
authorKazuki Sakamoto <sakamoto@splhack.org>
Mon, 29 Mar 2010 00:24:28 +0000 (29 09:24 +0900)
committerKazuki Sakamoto <sakamoto@splhack.org>
Mon, 29 Mar 2010 00:24:28 +0000 (29 09:24 +0900)
tree4b33891ab8d38bc5c5f86f9b8760e3dd27f63d26
parent5f11210633863848a2348703dea681fc45acf5b1
parent1ec9a7d48ed13d3bf24d081fce58b3c1f24cd00d
Merge branch 'work/KaoriYa' into KaoriYa

Conflicts:
CHANGES_KaoriYa.txt
runtime/lang/it/LC_MESSAGES/vim.mo
runtime/lang/uk/LC_MESSAGES/vim.mo
src/Make_mvc.mak