Ted Nyman
70396ab636
Merge pull request #460 from remobjects/master
...
Oxygene language detection
2013-11-05 15:14:34 -08:00
Ted Nyman
67b5b51c47
Merge pull request #499 from ppannuto/nesc
...
Add support for nesC
2013-11-05 15:13:32 -08:00
Ted Nyman
7b443fcdde
Merge pull request #758 from kashif/nvidia-cuda
...
added cuda lexer and removed example from c++ samples
2013-11-05 13:57:49 -08:00
Kashif Rasul
d86f8ba12f
merged from master and updated samples.json
2013-11-05 22:07:39 +01:00
Kashif Rasul
856ee4724c
Merge remote-tracking branch 'upstream/master' into nvidia-cuda
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-11-05 22:06:20 +01:00
Kashif Rasul
e635af4ef9
Revert 94b3ea3..b301634
...
This rolls back to commit 94b3ea3df5
2013-11-05 22:05:12 +01:00
Kashif Rasul
b30163444f
checked in updated samples.json
2013-11-05 22:02:41 +01:00
Ted Nyman
051bedefab
Include .emacs filenames
2013-11-05 12:26:17 -08:00
Ted Nyman
1d7f63e38b
Remove extra ace modes
2013-11-05 12:15:14 -08:00
Ted Nyman
d96657a48b
Alphabetize
2013-11-05 11:57:40 -08:00
Ted Nyman
8bdd6ea510
Merge pull request #578 from timm/patch-1
...
Update languages.yml
2013-11-05 11:57:11 -08:00
Ted Nyman
9f65e702fc
Remove dupe extension
2013-11-05 11:42:09 -08:00
Ted Nyman
a500dee94e
Update samples file
2013-11-05 11:36:56 -08:00
Ted Nyman
1a11a6ab48
Merge pull request #555 from timjb/master
...
Support Agda and Literate Agda
2013-11-05 11:36:20 -08:00
Ted Nyman
c5f1317b47
Update samples file
2013-11-05 11:34:48 -08:00
Tim Baumann
5e03ff961b
Merge branch 'master' of https://github.com/github/linguist
...
Conflicts:
lib/linguist/languages.yml
2013-11-05 16:55:48 +01:00
Kashif Rasul
94b3ea3df5
added cuda lexer and removed example from c++ samples
2013-11-05 10:57:12 +01:00
Ted Nyman
6d7eae5011
Merge pull request #757 from chlorinejs/clojure-samples
...
add Clojure and its dialects to /samples
2013-11-05 00:39:27 -08:00
Hoàng Minh Thắng
3bbeea3682
add Clojure and its dialects to /samples
2013-11-05 15:33:05 +07:00
Ted Nyman
a5c3bd7c13
Remove this until heuristic improves
2013-11-05 00:20:28 -08:00
Ted Nyman
6ae6882e1a
Merge pull request #657 from mndrix/prolog
...
Add misclassified Prolog file
2013-11-04 22:43:19 -08:00
Ted Nyman
c4ad830931
Add .vimrc
2013-11-04 22:29:24 -08:00
Ted Nyman
5d417b4669
Fix syntax
2013-11-04 22:19:38 -08:00
Ted Nyman
02a264fad8
Merge pull request #612 from adityam/master
...
Add extensions for ConTeXt
2013-11-04 22:19:05 -08:00
Ted Nyman
31c3c43f64
Merge pull request #550 from rschiang/master
...
Include Qt QML markup detection
2013-11-04 22:11:03 -08:00
Ted Nyman
5197ea2488
Merge pull request #731 from zhuzhuor/master
...
Add support for RobotFramework .robot files
2013-11-04 22:00:17 -08:00
Ted Nyman
66167de1f9
Merge pull request #754 from myguidingstar/master
...
add more Clojure extensions and/or dialects'
2013-11-04 21:58:37 -08:00
Hoàng Minh Thắng
9482c2b822
add more Clojure extensions and/or dialects'
2013-11-05 12:52:14 +07:00
Ted Nyman
012a9c0e05
Merge pull request #495 from andygrunwald/decimal-places-in-output
...
Add decimal places to statistic output
2013-11-04 21:46:32 -08:00
Ted Nyman
881201a2c6
Merge pull request #682 from Jaxan/patch-1
...
Added Clean language
2013-11-04 21:10:34 -08:00
Ted Nyman
d656988258
Merge pull request #589 from kynetx/adding_krl
...
added KRL config and sample
2013-11-04 21:09:36 -08:00
Ted Nyman
89f7f8a00b
Merge pull request #595 from j-jorge/patch-1
...
Add common file extensions to the c++ language
2013-11-04 21:08:20 -08:00
Ted Nyman
e4ec48fe8d
Merge pull request #751 from CodeBlock/master
...
Add Idris.
2013-11-04 21:07:25 -08:00
Ted Nyman
1a4f890d04
Merge pull request #620 from Bartvds/master
...
Added Vagrantfile and Chef /cookbooks to vendors.yml
2013-11-04 21:05:08 -08:00
Ted Nyman
71633871f3
Merge pull request #561 from assassini/master
...
Added an exclusion pattern for a "dependencies" folder in the root directory
2013-11-04 21:00:50 -08:00
Ted Nyman
f523561e66
Ignore .osx files
2013-11-04 20:57:40 -08:00
Bartvds
f3007215b1
Added Vagrantfile to vendors.yml
...
Closes #619
2013-11-05 05:53:09 +01:00
Ted Nyman
1847b237c9
Remove alias
2013-11-04 20:46:11 -08:00
Ted Nyman
07169db217
Merge pull request #531 from chriskuehl/master
...
Add vendor exception for PhoneGap/Cordova device-specific JavaScript libraries.
2013-11-04 20:43:46 -08:00
Ted Nyman
4b4b368356
Add .R extension
2013-11-04 20:41:30 -08:00
Ted Nyman
09ef0cd3e1
Add cproject extension
2013-11-04 20:39:48 -08:00
Ted Nyman
0f6bca7a3d
Merge pull request #596 from HQ063/patch-1
...
Update languages.yml
2013-11-04 20:37:05 -08:00
Chris Kuehl
5e3d811902
Merge github.com:github/linguist
...
Conflicts:
lib/linguist/vendor.yml
2013-11-04 20:32:52 -08:00
Ted Nyman
12c655a48a
Merge pull request #508 from AdamFerguson/master
...
Add Jade and Scaml
2013-11-04 20:30:20 -08:00
Ted Nyman
fdddffe041
Just .g4 for now
2013-11-04 20:27:46 -08:00
Ted Nyman
c3aab69b11
Merge pull request #697 from robstoll/master
...
Added ANTLR to the list, Pygments should have a lexer for ANTLR
2013-11-04 20:27:20 -08:00
Ted Nyman
3f1161d713
Merge pull request #643 from zulus/extjs_exclude
...
Exclude ExtJS library
2013-11-04 20:10:03 -08:00
Ted Nyman
cf14c5fa4f
Merge pull request #450 from Giacom/master
...
Added DM (Dream Maker) language.
2013-11-04 19:53:25 -08:00
Ted Nyman
8aac009b00
Add more xquery extensions
2013-11-04 19:49:54 -08:00
Ted Nyman
05bb8b10fd
Merge pull request #562 from hkdobrev/sublime-text
...
Added JSON extensions for Sublime Text
2013-11-04 19:40:48 -08:00
