Mislav Marohnić 
							
						 
					 
					
						
						
							
						
						090ea576b9 
					 
					
						
						
							
							github-linguist-grammars 4.6.2  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-21 21:23:40 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mislav Marohnić 
							
						 
					 
					
						
						
							
						
						6a2d33a4b3 
					 
					
						
						
							
							Bump language-javascript for syntax highlighting fix  
						
						 
						
						... 
						
						
						
						This is primarily to pull
https://github.com/atom/language-javascript/pull/227 
Full changelog:
c5c381e...7b14bbb (diff-46d5c1ca71eaebb92619d6c7abc9388d) 
						
						
							
						
					 
					
						2015-09-21 19:04:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wizawu 
							
						 
					 
					
						
						
							
						
						b54a9c7412 
					 
					
						
						
							
							Add new extension .tsx for TypeScript  
						
						 
						
						... 
						
						
						
						TypeScript 1.6 has introduced a new .tsx file extension. 
						
						
							
						
					 
					
						2015-09-21 13:48:30 +08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vicent Marti 
							
						 
					 
					
						
						
							
						
						2c62da7834 
					 
					
						
						
							
							Merge pull request  #2636  from github/vmg/git-linguist-oid  
						
						 
						
						... 
						
						
						
						git-linguist: Delay loading @commit_oid 
						
						
							
						
					 
					
						2015-09-16 16:48:12 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vicent Marti 
							
						 
					 
					
						
						
							
						
						0145a0adb2 
					 
					
						
						
							
							git-linguist: Delay loading @commit_oid  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-16 05:50:35 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vicent Marti 
							
						 
					 
					
						
						
							
						
						473282d64c 
					 
					
						
						
							
							Merge pull request  #2630  from github/vmg/memory  
						
						 
						
						... 
						
						
						
						4.6.0: Reduce memory pressure 
						
						
							
  v4.6.0
 
						
					 
					
						2015-09-15 11:19:45 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vicent Marti 
							
						 
					 
					
						
						
							
						
						c2c068e9db 
					 
					
						
						
							
							Bump version to 4.6.0  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-14 08:43:10 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vicent Marti 
							
						 
					 
					
						
						
							
						
						13d1f662d1 
					 
					
						
						
							
							Add the git-linguist helper  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-14 08:42:51 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						bdd57f58a0 
					 
					
						
						
							
							Merge pull request  #2625  from github/handlebars-group  
						
						 
						
						... 
						
						
						
						Adding Handlebars to the HTML group 
						
						
							
						
					 
					
						2015-09-09 09:18:11 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						b1bcabd6e6 
					 
					
						
						
							
							Adding Handlebars to the HTML group  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-08 12:25:05 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						e128c3fa82 
					 
					
						
						
							
							Merge pull request  #2622  from miksen/patch-1  
						
						 
						
						... 
						
						
						
						Language bar clarification in README.md 
						
						
							
						
					 
					
						2015-09-08 12:08:42 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						efac9fe750 
					 
					
						
						
							
							Merge pull request  #2624  from pchaigno/jsx-grammar  
						
						 
						
						... 
						
						
						
						New JSX language under JavaScript group 
						
						
							
						
					 
					
						2015-09-08 11:01:44 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						2b8545a8fa 
					 
					
						
						
							
							Merge pull request  #2567  from pcantrell/objc-import-statement  
						
						 
						
						... 
						
						
						
						#import "*.h" detection for Objective-C 
						
						
							
						
					 
					
						2015-09-08 10:53:32 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vicent Marti 
							
						 
					 
					
						
						
							
						
						b275b5d728 
					 
					
						
						
							
							Soften memory pressure  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-07 22:03:29 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Chaignon 
							
						 
					 
					
						
						
							
						
						1f46cfafa7 
					 
					
						
						
							
							New JSX language under JavaScript group  
						
						 
						
						... 
						
						
						
						A specific grammar is needed to highlight .jsx files
Thus, there are now in a distinct language but still in the JavaScript group 
						
						
							
						
					 
					
						2015-09-05 13:31:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								miksen 
							
						 
					 
					
						
						
							
						
						b1dcdf3418 
					 
					
						
						
							
							Language bar clarification in README.md  
						
						 
						
						... 
						
						
						
						Clarified what the percentages in the Language bar are based on. 
						
						
							
						
					 
					
						2015-09-04 11:49:10 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Cantrell 
							
						 
					 
					
						
						
							
						
						4bfd65deb8 
					 
					
						
						
							
							#import "*.h" detection for Objective-C  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-03 22:10:27 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Chaignon 
							
						 
					 
					
						
						
							
						
						213cf322f5 
					 
					
						
						
							
							Merge branch 'master' into blob_in_memory  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-04 00:55:39 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						61102812a0 
					 
					
						
						
							
							Merge pull request  #2619  from github/linguist-generated  
						
						 
						
						... 
						
						
						
						Adding support for generated overrides 
						
						
							
						
					 
					
						2015-09-03 15:02:16 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						580cfce7fb 
					 
					
						
						
							
							Adding support for generated overrides  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-03 14:39:27 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						f1383d7a45 
					 
					
						
						
							
							Merge pull request  #2616  from scttnlsn/patch-1  
						
						 
						
						... 
						
						
						
						Ignore spec fixtures 
						
						
							
						
					 
					
						2015-09-02 18:35:07 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott Nelson 
							
						 
					 
					
						
						
							
						
						e4ce5bfe39 
					 
					
						
						
							
							Ignore spec fixtures  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-02 12:52:25 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						6ed64f25a2 
					 
					
						
						
							
							Merge pull request  #2607  from Alhadis/master  
						
						 
						
						... 
						
						
						
						Add .geojson/.topojson as JSON extensions / Fix NCL colour 
						
						
							
						
					 
					
						2015-09-02 10:13:31 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alhadis 
							
						 
					 
					
						
						
							
						
						114a331106 
					 
					
						
						
							
							Add ".topojson" as a JSON extension  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-02 07:04:51 +10:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						9aa24a216a 
					 
					
						
						
							
							Merge pull request  #2612  from github/cut-release-v4.5.15  
						
						 
						
						... 
						
						
						
						Cut release v4.5.15 
						
						
							
  v4.5.15
 
						
					 
					
						2015-09-01 21:04:40 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						13702451ab 
					 
					
						
						
							
							Bumping to v4.5.15  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-01 19:13:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						f0242f6f97 
					 
					
						
						
							
							Updating grammars  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-01 19:12:27 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						9775820398 
					 
					
						
						
							
							Merge pull request  #2591  from jtbandes/master  
						
						 
						
						... 
						
						
						
						Vendored definitions for Xcode-related files 
						
						
							
						
					 
					
						2015-09-01 18:53:08 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						7daf26bcd0 
					 
					
						
						
							
							Merge pull request  #2604  from larsbrinkhoff/alphabetise-heuristics  
						
						 
						
						... 
						
						
						
						Alphabetise heuristics. 
						
						
							
						
					 
					
						2015-09-01 15:25:49 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						231f705098 
					 
					
						
						
							
							Merge pull request  #2606  from thejameskyle/jsproj  
						
						 
						
						... 
						
						
						
						Add .jsproj extension 
						
						
							
						
					 
					
						2015-09-01 15:23:53 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						893ab8fd8d 
					 
					
						
						
							
							Merge pull request  #2610  from ismail-arilik/patch-1  
						
						 
						
						... 
						
						
						
						Add color for the PL/SQL language. 
						
						
							
						
					 
					
						2015-09-01 15:20:49 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ismail-arilik 
							
						 
					 
					
						
						
							
						
						5afdd2c533 
					 
					
						
						
							
							Add color for the PL/SQL language.  
						
						 
						
						... 
						
						
						
						I have added color to the PL/SQL language: #dad8d8. I take this color from a window background which evokes the interface of the language. 
						
						
							
						
					 
					
						2015-09-01 14:23:59 +03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lars Brinkhoff 
							
						 
					 
					
						
						
							
						
						e4f5c0066a 
					 
					
						
						
							
							Add checks to keep heuristics alphabetised.  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-01 08:21:34 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alhadis 
							
						 
					 
					
						
						
							
						
						a167f852dd 
					 
					
						
						
							
							Alphabetise JSON extensions  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-01 07:33:07 +10:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alhadis 
							
						 
					 
					
						
						
							
						
						b428bce126 
					 
					
						
						
							
							Quote NCL language's colour value  
						
						 
						
						... 
						
						
						
						Without double-quotes, the hex colour is interpreted as a YAML comment.
Originally added in 2d39258 . 
						
						
							
						
					 
					
						2015-09-01 07:24:17 +10:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alhadis 
							
						 
					 
					
						
						
							
						
						e62d0e19a5 
					 
					
						
						
							
							Add ".geojson" as a JSON extension  
						
						 
						
						
						
						
							
						
					 
					
						2015-09-01 07:12:18 +10:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Kyle 
							
						 
					 
					
						
						
							
						
						9b8bf9068f 
					 
					
						
						
							
							Move jsproj example to xml directory  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-31 11:35:01 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Kyle 
							
						 
					 
					
						
						
							
						
						6e05edc350 
					 
					
						
						
							
							Add .jsproj extension  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-31 10:26:29 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lars Brinkhoff 
							
						 
					 
					
						
						
							
						
						dd8eaf2893 
					 
					
						
						
							
							Alphabetise heuristics.  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-31 08:53:51 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Fellinger 
							
						 
					 
					
						
						
							
						
						ecc750f445 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/github/linguist  into origin/patch-1  
						
						 
						
						... 
						
						
						
						* 'master' of https://github.com/github/linguist :
  Switch to Apache License.
  also add help for unapproved licenses
  Update X10 grammar license.
  add some help text to license test
  Fix typo in Obj-C heuristic keyword
  Add the X10 language (http://x10-lang.org/ ).
  Sublime Text workspace files as vendored
  Make Slick regexp more general
  Tests for new vendored files
  Test for new CodeMirror regexp
  New JS vendored files
  Fix CodeMirror regex for vendored files
  added *.lslp to samples/LSL folder
  added *.lslp as LSL(Linden Scripting Language)
Conflicts:
	.gitmodules 
						
						
							
						
					 
					
						2015-08-28 14:08:31 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Fellinger 
							
						 
					 
					
						
						
							
						
						cf5268a7d4 
					 
					
						
						
							
							add Pony language  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-28 14:04:10 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Balter 
							
						 
					 
					
						
						
							
						
						e24efad5ff 
					 
					
						
						
							
							Merge pull request  #2594  from github/license-help  
						
						 
						
						... 
						
						
						
						Add some additional help text to license test 
						
						
							
						
					 
					
						2015-08-26 14:55:37 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						58a34cdb7d 
					 
					
						
						
							
							Merge pull request  #2589  from mandel/master  
						
						 
						
						... 
						
						
						
						Add the X10 language. 
						
						
							
						
					 
					
						2015-08-26 19:36:54 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Mandel 
							
						 
					 
					
						
						
							
						
						b1c6b330e9 
					 
					
						
						
							
							Switch to Apache License.  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-26 14:26:30 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Balter 
							
						 
					 
					
						
						
							
						
						7c3e265033 
					 
					
						
						
							
							also add help for unapproved licenses  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-26 12:31:29 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Mandel 
							
						 
					 
					
						
						
							
						
						13695a716c 
					 
					
						
						
							
							Update X10 grammar license.  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-26 09:46:02 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ben Balter 
							
						 
					 
					
						
						
							
						
						c9e43804d6 
					 
					
						
						
							
							add some help text to license test  
						
						 
						
						
						
						
							
						
					 
					
						2015-08-26 09:26:04 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						1535e3553e 
					 
					
						
						
							
							Merge pull request  #2580  from LeonaMorro/master  
						
						 
						
						... 
						
						
						
						add *.lslp as an additional extension for LSL (LindenScriptingLanguage) 
						
						
							
						
					 
					
						2015-08-26 14:09:48 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						0ac05bbbeb 
					 
					
						
						
							
							Merge pull request  #2582  from pchaigno/vendor-libraries  
						
						 
						
						... 
						
						
						
						Vendored JS files 
						
						
							
						
					 
					
						2015-08-26 14:02:57 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arfon Smith 
							
						 
					 
					
						
						
							
						
						d3f979d640 
					 
					
						
						
							
							Merge pull request  #2592  from jtbandes/typo  
						
						 
						
						... 
						
						
						
						Fix typo in Obj-C heuristic keyword 
						
						
							
						
					 
					
						2015-08-26 12:52:05 +01:00