Rick Bradley
62e34caa4c
regen samples.json on new master
2014-04-21 11:46:01 -05:00
Arfon Smith
142dcd27e5
Merge branch 'master' into obj_cpp
...
Conflicts:
lib/linguist/samples.json
2014-04-21 11:44:24 -05:00
Rick Bradley
2f94e46f1f
Merge branch 'master' into GrammaticalFramework-master
2014-04-21 11:42:23 -05:00
Arfon Smith
26fbc45baf
Merge branch 'master' into 815
...
Conflicts:
lib/linguist/samples.json
2014-04-21 11:37:49 -05:00
Rick Bradley
a2537fa108
regen samples.json from current master
2014-04-21 11:32:50 -05:00
Rick Bradley
8e76ba2020
Merge branch 'master' into SparkysWidgets-master
2014-04-21 11:31:14 -05:00
Arfon Smith
00ff4a1d8a
Merge branch 'master' into 817-updated
...
Conflicts:
lib/linguist/samples.json
2014-04-21 11:23:48 -05:00
Arfon Smith
98dacd07c2
Merge branch 'master' into 817
...
Conflicts:
lib/linguist/samples.json
2014-04-21 11:22:18 -05:00
Rick Bradley
2aa27c99b3
regen samples on new new master
2014-04-21 11:12:37 -05:00
Arfon Smith
236f521e13
Merge pull request #1084 from github/891-update
...
891 update
2014-04-21 11:11:06 -05:00
Brandon Keepers
d0d6dfa5c0
Merge pull request #1041 from Mikulas/typo
...
Fix languages.yml 'interpreters' key documentation
2014-04-21 12:09:46 -04:00
Arfon Smith
5af528184d
Merge branch 'master' into 891-update
...
Conflicts:
lib/linguist/samples.json
2014-04-21 11:09:06 -05:00
Rick Bradley
01c4fba092
merge master; regen samples data
2014-04-21 11:08:29 -05:00
Arfon Smith
20c9ed9f36
Adding .tm Tcl samples
2014-04-21 11:04:23 -05:00
Rick Bradley
40f4c49ba9
Merge pull request #879 from zilverline/master
...
Legit. Merging.
Thanks for the bugfix, @s0meone!
2014-04-21 09:04:22 -07:00
Arfon Smith
a265237b2e
Merge branch 'master' into 891
2014-04-21 11:01:50 -05:00
Rick Bradley
e7f5cadfcb
regen samples with new new master
2014-04-21 10:59:35 -05:00
Rick Bradley
96a162225d
regen samples.json
2014-04-21 10:52:13 -05:00
Arfon Smith
09c2f763f1
Merge branch 'master' into updated-922
...
Conflicts:
lib/linguist/samples.json
2014-04-21 10:51:42 -05:00
Rick Bradley
ce096e277d
Merge pull request #1081 from github/pr-931-updated
...
Mathematica (part deux) -- replaces #931
2014-04-21 08:50:14 -07:00
Arfon Smith
c0bb883aaa
Merge branch 'master' into 922
...
Conflicts:
lib/linguist/samples.json
2014-04-21 10:48:04 -05:00
Rick Bradley
23eea82139
please the pedant
2014-04-21 10:42:33 -05:00
Arfon Smith
edd9881642
Merge pull request #961 from couchand/patch-1
...
Add React library to vendor.yml
2014-04-21 10:38:29 -05:00
Rick Bradley
e46c6968ba
merge master; regen samples
2014-04-21 10:38:26 -05:00
Brandon Keepers
1528847249
Merge pull request #1052 from shrayas/cache-vendor-fix
...
Fixing cache vendor regex
2014-04-21 11:30:06 -04:00
Brandon Keepers
182aaf8fce
Merge pull request #951 from github/javascript-nodejs-interpreter
...
Add interpreter for JavaScript
2014-04-21 11:28:03 -04:00
Arfon Smith
d6dfa1dcbc
Merge pull request #965 from pchaigno/systemverilog
...
Support of SystemVerilog
2014-04-21 10:25:20 -05:00
Arfon Smith
9562b8ad3d
Merge pull request #969 from pchaigno/aspectj
...
Support of AspectJ language
2014-04-21 10:14:27 -05:00
Arfon Smith
19a67c07fe
Merge branch 'master' into 979
2014-04-21 09:59:18 -05:00
Sebastian Godelet
2ef130530d
Merge remote-tracking branch 'upstream/master' into mercury-noconflict
2014-04-18 12:28:18 +02:00
Jasen Borisov
5606916d99
Oops, looks like this has to be alphabetical...
2014-04-17 20:50:37 +09:00
Jasen Borisov
3d4b682d63
Add .vshader, .fshader, .gshader files for GLSL.
2014-04-17 17:04:12 +09:00
Steven Normore
96561c24be
change golang color to #3399ff
2014-04-16 16:59:26 -04:00
Joe Kutner
0cd1566145
sorted the languages.yml file alphabetically
2014-04-16 13:50:19 -05:00
Joe Kutner
b6aa9f9b12
Added ShellSession language using pygments Bash Session lexer
2014-04-16 12:21:14 -05:00
Gusakov Nikita
0240b76cc3
Added Zephir language
2014-04-15 20:13:32 +04:00
Lucas Werkmeister
3f96bcc32b
Add .osm extension for XML
...
The OpenStreetMap project (openstreetmap.org) uses the .osm extension for the OSM XML format (http://wiki.openstreetmap.org/wiki/OSM_XML ).
2014-04-14 10:07:15 +02:00
MK
9b8823ab3c
Added Buildr 'Buildfile' and 'buildfile'
...
All other options (as listed at https://github.com/apache/buildr/blob/master/lib/buildr/core/application.rb#L110 ) are already covered by other things here.
2014-04-11 10:18:20 -04:00
Santiago Perez De Rosso
8ba9446fcd
temporarily set lexer to Text Only for Alloy
2014-04-07 22:44:35 -04:00
Santiago Perez De Rosso
04a6af4272
alloy support
2014-04-07 18:04:59 -04:00
Shrayas Rajagopal
a1641f2ffa
Fixing cache vendor regex
...
* Fixes #1051
* Any folder with "cache" in it was being ignored. This fixes it.
2014-04-07 11:35:28 +05:30
Sebastian Godelet
fe183c07f5
added .moo (parser definitions) to Mercury extension list
2014-04-06 20:26:28 +02:00
Sebastian Godelet
a620d45635
added Mercury/ to 'vendor' directory
2014-04-06 20:25:22 +02:00
Sebastian Godelet
fa9660d5a1
Included store.m in Mercury/samples, now 100% coverage in Mercury library/ and compiler/
2014-04-06 20:00:21 +02:00
Sebastian Godelet
8b39d30a6e
changed mercury extension to .mercury, to avoid conflict with Obj-C
2014-04-06 18:36:05 +02:00
Sebastian Godelet
090ffa4191
fixing merge conflict in vendor.yml
2014-04-06 18:07:06 +02:00
Paul Bone
42194094a2
Add the Mercury language to linguist
...
lib/linguist/languages.yml:
Add the declaration for the language.
samples/Mercury:
Add samples for the classifier as Mercury shares it's filename extension
with several other languages.
2014-04-06 18:05:27 +02:00
Jerome Bakker
08058f9f2e
Update vendor.yml
...
extend the vendor/ exclusion to handle vendors/
Some projects use this folder to store external libaries (eg https://github.com/Elgg/Elgg )
2014-04-06 17:45:54 +02:00
Triangle717
3d76ba001f
Update languages.yml
...
Detect Inno Setup installer scripts (http://www.jrsoftware.org/isinfo.php )
2014-04-06 17:45:54 +02:00
Max Horn
078a2877c7
Add support for the GAP language
2014-04-05 13:26:41 +02:00
