Merge remote-tracking branch 'upstream/master'

This commit is contained in:
edendramis
2015-10-15 14:07:13 -07:00
46 changed files with 411 additions and 44 deletions

View File

@@ -2453,6 +2453,7 @@ PHP:
- .php3
- .php4
- .php5
- .phps
- .phpt
filenames:
- Phakefile
@@ -2469,6 +2470,7 @@ PLSQL:
color: "#dad8d8"
extensions:
- .pls
- .pck
- .pkb
- .pks
- .plb
@@ -3454,6 +3456,7 @@ TypeScript:
- ts
extensions:
- .ts
- .tsx
tm_scope: source.ts
ace_mode: typescript
@@ -3670,6 +3673,7 @@ XML:
- .tmSnippet
- .tmTheme
- .ts
- .tsx
- .ui
- .urdf
- .vbproj

View File

@@ -1,3 +1,3 @@
module Linguist
VERSION = "4.6.3"
VERSION = "4.6.4"
end