Arfon Smith
44c5413abf
Merge pull request #1256 from github/1042-update
...
1042 update
2014-06-06 12:38:45 -05:00
Arfon Smith
50ab58e91f
Merge commit 'refs/pull/1042/head' of github.com:github/linguist into 1042
...
Conflicts:
lib/linguist/vendor.yml
2014-06-06 12:32:30 -05:00
Arfon Smith
1fd0732390
Merge branch 'master' into 1042
...
Conflicts:
lib/linguist/vendor.yml
2014-06-06 12:31:56 -05:00
Arfon Smith
d3c04d6310
nesC
2014-06-06 12:08:38 -05:00
Julian Gehring
f66ffe305f
Change R package ignores to absolute paths
2014-06-06 08:57:11 -07:00
Arfon Smith
2a9ff0083c
Merge branch 'master' into 814
...
Conflicts:
lib/linguist/languages.yml
2014-06-06 09:55:08 -05:00
Brian Lopez
67f7268a55
bump version for v2.11.4 release
2014-06-05 10:55:32 -05:00
Brian Lopez
7e8be1293e
Use the :ruby_encoding value from charlock 0.7.2
2014-06-04 15:51:33 -05:00
Arfon Smith
09c234ec26
Merge pull request #1190 from Madsn/patch-1
...
Add html5shiv to vendor.yml
2014-06-04 10:30:03 -05:00
Arfon Smith
98f35aefdc
Merge branch 'master' into 1035
...
Conflicts:
lib/linguist/languages.yml
lib/linguist/samples.json
2014-06-03 22:03:59 -05:00
Arfon Smith
38a3714514
Samples update
2014-06-03 21:37:25 -05:00
Arfon Smith
491700f925
Merge pull request #1198 from Spirit-of-Oberon/master
...
Support of the Component Pascal language
2014-06-03 21:36:52 -05:00
Andy Lindeman
b7685ab317
Bumps to 2.11.3
2014-06-03 14:50:17 -04:00
Andy Lindeman
aa5a94cc3e
Handle case where newline chars don't transcode to detected encoding
...
We've seen cases where binary files are detected as encodings such as
ISO-8859-8-I. This usually happens when the binary files are short, so
while the detector is mistaken, there is also not very much data for use
in the detection algorithm in the first place so it's understandable
that the detector was wrong.
In these cases, the code to convert ASCII newline characters to
encodings such as ISO-8859-8-I fails because there is no conversion
between them.
We now simply assume that the data is all one line in those cases. In
reality the data is binary, but this obviously difficult to detect
reliably.
2014-06-03 12:26:23 -04:00
Adrian Kashivskyy
2164b28c64
Update Swift color
2014-06-03 16:03:49 +02:00
Adrian Kashivskyy
0fb824b345
Add orange color to Swift
2014-06-03 15:54:15 +02:00
Arfon Smith
4a7ae50ec8
Dammit
2014-06-02 21:07:11 -05:00
Arfon Smith
398439a937
Pedantic
2014-06-02 21:04:39 -05:00
Arfon Smith
a3bc3a7615
Merge branch 'master' into 1239-update
...
Conflicts:
lib/linguist/samples.json
2014-06-02 21:01:00 -05:00
Arfon Smith
7989fbd613
Samples
2014-06-02 21:00:03 -05:00
john howard
c389c79be9
fixed zimpl declaration position collation order problem
2014-06-02 18:30:45 -07:00
john howard
1fd2f921fd
added yet another zimpl extension that is in use
2014-06-02 18:28:00 -07:00
john howard
ed851849db
added extra extension for zimpl
2014-06-02 18:23:07 -07:00
john howard
4e15369f9a
added missing lexer for zimpl
2014-06-02 17:27:24 -07:00
john howard
a6955f4edb
added zmpl language declaration
2014-06-02 15:09:41 -07:00
Arfon Smith
8d2ea90a5b
Bumping to 2.11.2
2014-06-02 14:59:12 -05:00
Andy Lindeman
8f251e6756
Adds basic support for the Swift programming language
...
Text only lexer for now until Pygments catches up
2014-06-02 15:54:05 -04:00
Arfon Smith
4cd35c1f33
Samples update
2014-05-31 09:20:20 -05:00
Arfon Smith
78fda33707
Merge pull request #1209 from jkeirstead/GAMS-language
...
Added the General Algebraic Modeling System (GAMS) to languages with example
2014-05-31 09:19:57 -05:00
Arfon Smith
efbcb942c3
Merge branch 'master' into 1206
...
Conflicts:
lib/linguist/samples.json
2014-05-31 09:13:42 -05:00
Christian Bundy
72a6186f08
Fix Ox implementation
...
Remove .h from Ox, fix `lex` typo, and add samples for Ox.
2014-05-30 15:47:42 -07:00
Christian Bundy
8cde6d2e8f
Merge branch 'master' of https://github.com/github/linguist into add-ox
2014-05-30 15:33:51 -07:00
Arfon Smith
4f2c7fdc3c
Merge pull request #1227 from github/1178-update
...
1178 update
2014-05-30 16:25:47 -05:00
Arfon Smith
5a830504a4
Merge branch 'master' into 1178
...
Conflicts:
lib/linguist/samples.json
2014-05-30 16:15:28 -05:00
Arfon Smith
086fb09038
Merge pull request #1226 from christianbundy/patch-2
...
Add Cheat Engine's .ct as an XML extension
2014-05-30 16:11:54 -05:00
Arfon Smith
5544a041ce
Samples update
2014-05-30 16:11:01 -05:00
Arfon Smith
6447333368
Merge pull request #1208 from jkeirstead/R-documentation
...
R documentation
2014-05-30 16:08:41 -05:00
Christian Bundy
1d6a42f0eb
Add Cheat Engine's .ct as an XML extension
...
Add .ct as an XML extension instead of its own language, as recommended by @arfon in #1199
2014-05-30 14:04:59 -07:00
Arfon Smith
de14b75517
Samples update
2014-05-30 15:59:30 -05:00
Arfon Smith
0f302713da
Merge pull request #1188 from kaendfinger/master
...
Groovy: Add .gvy, .grt, and .gtpl to the list of extensions
2014-05-30 15:58:59 -05:00
Arfon Smith
4fefe2020f
Merge branch 'master' into 815-update
...
Conflicts:
lib/linguist/samples.json
2014-05-30 15:38:55 -05:00
Arfon Smith
72fab07a14
Text only
2014-05-30 15:37:38 -05:00
Arfon Smith
adbf4f6b17
Samples update
2014-05-30 15:33:36 -05:00
Arfon Smith
cfcf4ca915
Merge pull request #1203 from kostko/master
...
Add .ipp extension for C++
2014-05-30 15:21:16 -05:00
Arfon Smith
c427fba87f
Merge pull request #1200 from andyli/patch-1
...
Haxe: Use haxe logo color.
2014-05-30 15:20:38 -05:00
Arfon Smith
ab14bcab03
Merge pull request #1215 from felixphew/patch-1
...
Add .mkdn as a Markdown extension
2014-05-30 14:59:12 -05:00
ferrall
78de3fb959
Update languages.yml
...
added explicit lexer
2014-05-28 14:03:27 -04:00
ferrall
b9eda90ddd
Update languages.yml
...
Adding Ox to the list http://www.doornik.com/ox/
2014-05-27 14:47:20 -04:00
Arfon Smith
41da8c6352
SQL -> data
2014-05-27 05:50:40 -05:00
Josh Oldenburg
04f4b05412
Ignore files related to Cocoapods.
...
These include Podfile, Podfile.lock, and Pods/.
2014-05-26 10:35:11 -04:00
