Peter Simons
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d326e5032
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into staging.
						
						
						
						
						
						
						
						Conflicts:
	pkgs/desktops/e18/enlightenment.nix 
						
						
					 | 
					
						2014-08-04 16:51:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mateusz Kowalczyk
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a45996233
							
						
					 | 
					
						
						
							
							Turn some license strings into lib.licenses values
						
						
						
						
						
						
					 | 
					
						2014-07-28 11:31:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eelco Dolstra
							
						 
					 | 
					
						
						
						
						
							
						
						
							40f7b0f9df
							
						
					 | 
					
						
						
							
							Another attempt to eradicate ensureDir
						
						
						
						
						
						
						
						See c556a6ea46e71e1907d78b71fab36df30297b3ad. 
						
						
					 | 
					
						2014-06-30 14:56:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lluís Batlle i Rossell
							
						 
					 | 
					
						
						
						
						
							
						
						
							78827836cc
							
						
					 | 
					
						
						
							
							openlierox: fixing and updating.
						
						
						
						
						
						
					 | 
					
						2013-04-06 12:09:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Eelco Dolstra
							
						 
					 | 
					
						
						
						
						
							
						
						
							c556a6ea46
							
						
					 | 
					
						
						
							
							* "ensureDir" -> "mkdir -p".  "ensureDir" is a rather pointless
						
						
						
						
						
						
						
						function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644 
						
						
					 | 
					
						2012-01-18 20:16:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Raskin
							
						 
					 | 
					
						
						
						
						
							
						
						
							a42b80d221
							
						
					 | 
					
						
						
							
							Adding OpenLieroX
						
						
						
						
						
						
						
						svn path=/nixpkgs/trunk/; revision=16617 
						
						
					 | 
					
						2009-08-08 18:18:33 +00:00 | 
					
					
						
						
							
							
							
						
					 |