2736 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arfon Smith	acbe0e4a51	Merge pull request #1093 from github/1005-update ... 1005 update	2014-04-21 12:55:58 -05:00
Arfon Smith	22e09a587c	Merge branch 'master' into 1005 ... Conflicts: lib/linguist/samples.json	2014-04-21 12:51:40 -05:00
Arfon Smith	1b5d35a536	Samples update	2014-04-21 12:47:09 -05:00
Arfon Smith	5d480fc6d6	Merge pull request #1008 from garyb/master ... PureScript programming language	2014-04-21 12:46:42 -05:00
Arfon Smith	f5b361c31b	Merge pull request #1092 from github/1068-update ... 1068 update	2014-04-21 12:20:51 -05:00
Arfon Smith	918a69e6f0	Merge branch 'master' into 1068 ... Conflicts: lib/linguist/samples.json	2014-04-21 12:19:12 -05:00
Arfon Smith	6d346fdc8d	Merge pull request #1071 from jkutner/add_session_lang ... Added ShellSession language	2014-04-21 12:11:43 -05:00
Arfon Smith	09506dbbd9	Merge pull request #1056 from spderosso/alloy ... Add support for the Alloy language	2014-04-21 11:58:55 -05:00
Rick Bradley	e11a671a1d	Merge pull request #1090 from github/pr-1011-updated ... Add SourcePawn language, part deux (replaces #1011)	2014-04-21 09:56:29 -07:00
Rick Bradley	c72ad3f402	regen samples.json on current master	2014-04-21 11:54:10 -05:00
Arfon Smith	48b240630e	Merge pull request #882 from github/obj_cpp ... Updating Obj C++ PR so that it merges cleanly	2014-04-21 11:52:24 -05:00
Arfon Smith	715732bb93	Merge branch 'master' into obj_cpp ... Conflicts: lib/linguist/samples.json	2014-04-21 11:51:50 -05:00
Rick Bradley	2f01a4bd78	Merge pull request #1089 from github/pr-668-updated ... Add Grammatical Framework, part deux (replaces #668)	2014-04-21 09:49:34 -07:00
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
Rick Bradley	5c5999fbf3	Merge pull request #1087 from github/pr-718-updated ... Updated languages.yml to add support for EAGLE PCB, part deux (replaces #718)	2014-04-21 09:38:21 -07: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	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
Sebastian Godelet	2ef130530d	Merge remote-tracking branch 'upstream/master' into mercury-noconflict	2014-04-18 12:28:18 +02:00