KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Anthony Zhang
2011-09-01 17:56:09 -04:00
parent 09231805ee 0239a59248
commit d73657078d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/linguist/languages.yml
View File

@@ -390,7 +390,7 @@ Groovy Server Pages:
group: Groovy group: Groovy
lexer: Java Server Page lexer: Java Server Page
overrides: overrides:
- .gsp - .gsp
aliases: aliases:
- gsp - gsp
extensions: extensions:
@@ -451,6 +451,7 @@ INI:
extensions: extensions:
- .cfg - .cfg
- .ini - .ini
- .prefs
- .properties - .properties
filenames: filenames:
- .gitconfig - .gitconfig
@@ -996,6 +997,9 @@ XML:
- .xsd - .xsd
- .xsl - .xsl
- .xul - .xul
filenames:
- .classpath
- .project
XQuery: XQuery:
type: programming type: programming

2
linguist.gemspec
View File

@@ -8,6 +8,6 @@ Gem::Specification.new do |s|
s.add_dependency 'escape_utils', '0.2.3' s.add_dependency 'escape_utils', '0.2.3'
s.add_dependency 'mime-types', '1.16' s.add_dependency 'mime-types', '1.16'
s.add_dependency 'pygments.rb', '~> 0.2.0' s.add_dependency 'pygments.rb', '~> 0.2.1'
s.add_development_dependency 'rake' s.add_development_dependency 'rake'
end end