install.sh
fix
fix
Merge branch 'master' of https://github.com/linshibo/myvim

Conflicts:
	_vim/backupdir/.bashrc~
	_vim/backupdir/.netrwhist~
	_vim/backupdir/.vimrc~
	_vim/backupdir/Makefile~
	_vim/backupdir/a.cpp~
	_vim/backupdir/asynserver.go~
	_vim/backupdir/bench.conf~
	_vim/backupdir/db.go~
	_vim/backupdir/f~
	_vim/backupdir/gameserver.go~
	_vim/backupdir/hero.go~
	_vim/backupdir/hub.go~
	_vim/backupdir/hub_handler.go~
	_vim/backupdir/index.tmpl~
	_vim/backupdir/log.go~
	_vim/backupdir/login.go~
	_vim/backupdir/main.cpp~
	_vim/backupdir/main.go~
	_vim/backupdir/pool.go~
	_vim/backupdir/profile~
	_vim/backupdir/router.go~
	_vim/backupdir/system.go~
	_vim/backupdir/update.sh~
	install.sh

    fix