[ append wordpress setting ]
[ add prompt files ]
[ neobundlefiletype ]
[ reset filetypes ]
[ change vimrc ]

add depends NeoBundles
[ append php.ini ]
[ append augroup ]
[ append etc.. ]
[ fix bug rsense ]
[ vimrc 大幅軽量化 ]
[ fix bug rails.vim ]
[ fix bug indent ]
[ fix bug vimrc ]
[ append vimrc ]
[ ちょっと編集 ]
[ append vim rc]
[ append 色々 ]
Merge 192.168.1.8:~/src/dotfiles

Conflicts:
  .vim/config/.vimrc
  serclet
[ server append ]
Merge branch 'master' into server

Conflicts:
  .gitconfig
  .vim/config/.vimrc
  setup.sh