1969 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arfon Smith	26fbc45baf	Merge branch 'master' into 815 ... Conflicts: lib/linguist/samples.json	2014-04-21 11:37:49 -05:00
Arfon Smith	0f5e2a1ea4	Merge pull request #1086 from github/817-updated ... 817 updated	2014-04-21 11:24:37 -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	701f5220fc	Merge pull request #1085 from github/pr-826-updated ... Add Frege Language, part deux (replaces #826)	2014-04-21 09:21:38 -07: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	a4eea6b8cd	Merge pull request #1083 from github/pr-899-updated ... Add Game Make Language, part deux (replaces #899)	2014-04-21 09:00:20 -07:00
Rick Bradley	e7f5cadfcb	regen samples with new new master	2014-04-21 10:59:35 -05:00
Arfon Smith	21d3a3a141	Merge pull request #1082 from github/updated-922 ... Updated 922	2014-04-21 10:52:48 -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
Rick Bradley	6450d5861a	Merge pull request #973 from whitten/patch-1 ... Builds green with master. Merging.	2014-04-21 08:16:59 -07: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	507248dd95	Merge pull request #1080 from github/979-update ... Update of https://github.com/github/linguist/pull/979	2014-04-21 10:03:22 -05:00
Arfon Smith	19a67c07fe	Merge branch 'master' into 979	2014-04-21 09:59:18 -05:00
Rick Bradley	0c6f4383a7	Merge pull request #1075 from github/release-2.10.12 ... cut a 2.10.12 release v2.10.12	2014-04-17 13:26:12 -07:00
Rick Bradley	97908204a3	2.10.12	2014-04-17 11:28:15 -05:00
Brandon Keepers	b6d0a41718	Merge pull request #1063 from lucaswerkmeister/patch-1 ... Add .osm extension for XML	2014-04-16 09:57:21 -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
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
Mikulas	b6cadc93f2	Fix languages.yml 'interpreters' key documentation	2014-04-03 10:17:14 +02:00
Ted Nyman	f39456ee47	Merge pull request #991 from waywardmonkeys/improve-dylan-support ... Add .lid and .intr extensions for Dylan.	2014-03-15 18:13:41 -07:00
Bruce Mitchener	957dd15d5b	Add .lid and .intr extensions for Dylan.	2014-03-14 22:03:31 +07:00
Ted Nyman	2e731a1084	Merge pull request #978 from cronycle/master ... added VCR Cassette to the 'generated' list so they get suppressed	2014-03-13 14:37:25 -07:00
Ted Nyman	38bd07a113	Merge pull request #832 from dasmithii/patch-2 ... Updated language list to include HOW, and fixed the lack of lexer proble...	2014-03-11 20:24:07 -07:00
Douglas Adam Smith II	645411e256	Testing...	2014-03-11 14:23:28 -04:00
Douglas Adam Smith II	29510b26e0	Fix	2014-03-11 14:00:49 -04:00
Douglas Adam Smith II	e4c1cc572b	Fixed order of languages. Forgot how ASCI works. ... This will (hopefully) fix the build.	2014-03-11 13:51:16 -04:00
Douglas Adam Smith II	7c85c11944	Updated How language to FLUX (name change)	2014-03-11 13:38:10 -04:00
Ted Nyman	5318402be5	Merge pull request #981 from cjxgm/patch-1 ... add extension .cc for c++	2014-03-09 04:21:02 -07:00
eXerigumo Clanjor (哆啦比猫/兰威举)	8323450958	add extension .cc for c++	2014-03-09 16:12:30 +08:00
Nayeem Syed	68793b1f0f	added check for extension and line count on vcr_cassette? in generated	2014-03-08 08:12:18 +00:00
Ted Nyman	c6e3c8fab8	Merge pull request #963 from mbezjak/vendor-gradle ... Add gradle wrapper files to vendor.yml	2014-03-07 20:46:46 -08:00
Max Ogden	54c1d7c9d9	update improved javascript color in test_language	2014-03-06 23:38:59 -08:00
Max Ogden	3a19ba4523	dramatically enhance colors for javascript and css	2014-03-06 23:10:05 -08:00