debug
Merge branch 'dev' of github.com:wolfwzr/etc into dev

aha?
add set number
Merge branch 'dev' of github.com:wolfwzr/etc into dev

add ipad ip
add ipad ip
set syntax=nasm for .asm file
Merge branch 'dev' of github.com:wolfwzr/etc into dev

Merge for set syntax=nasm
add for acer aspire one
complete install.sh
solve merge problem
fixed ps1 and others
update ps1
fixed samething for acer aspire one
状态栏在遇到未处理（WOLFWZR_filetype_setting 函数未处理）的文件类型时经常出现状态栏侵占命令行栏的现象，debug发现重新设置字体能临时解决这个问题
some fix for acer aspire one
merge
fixed merge conflict for vimrc
fiexd for acer aspire one
fix PATH
debug osx