merge
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/kosuda/dotfiles
Merge remote-tracking branch 'origin/master'
change for cocos2dx
Merge branch 'master' of https://github.com/kosuda/dotfiles
merge vimrc
add xvimrc