Merge branch 'master' into 1233-local

Conflicts:
	lib/linguist/language.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json
This commit is contained in:
Arfon Smith
2014-11-01 09:59:29 -05:00
parent 12b78c5357
commit 9e50e188a8
77 changed files with 3066 additions and 74080 deletions

View File

@@ -0,0 +1,8 @@
set nocompatible
set ignorecase
set incsearch
set smartcase
set showmatch
set showcmd
syntax on