Merge branch 'vim72-20100313-kaoriya-w64j' into KaoriYa_vim72-20100313-kaoriya-w64j
commitc6eb7de982756f1262229ec9e5fd8e5a7de7e587
authorKazuki Sakamoto <sakamoto@splhack.org>
Sun, 14 Mar 2010 21:22:39 +0000 (15 06:22 +0900)
committerKazuki Sakamoto <sakamoto@splhack.org>
Sun, 14 Mar 2010 21:22:39 +0000 (15 06:22 +0900)
tree6d294ec028019318d9a11527a37b27169c0abeda
parent4ef3c9ac6456abef250a1954c90ec2309737c7bf
parent07c22bc25bb06bf43a35eaca90a5774756d657b5
Merge branch 'vim72-20100313-kaoriya-w64j' into KaoriYa_vim72-20100313-kaoriya-w64j

Conflicts:
src/auto/config.mk
runtime/spell/ny/ny_MW.diff