Sally Coolatta
								
							 
						 | 
						
							
							
							
							
								
							
							
								9afadccefa
								
							
						 | 
						
							
							
								
								Fix duplicates being added to .travis.yml & debain-template/control
							
							
							
							
							
						 | 
						
							2020-08-09 21:32:55 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sally Coolatta
								
							 
						 | 
						
							
							
							
							
								
							
							
								e296e1309a
								
							
						 | 
						
							
							
								
								YAY, round 2
							
							
							
							
							
						 | 
						
							2020-08-09 21:02:56 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sally Coolatta
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f630a3c93
								
							
						 | 
						
							
							
								
								Merge debain-template/control
							
							
							
							
							
						 | 
						
							2020-08-09 20:49:49 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sally Coolatta
								
							 
						 | 
						
							
							
							
							
								
							
							
								63917ffccc
								
							
						 | 
						
							
							
								
								The start of the scary 2.2 merge
							
							
							
							
							
							
							
							All conflicts are left in-tact. We should be collaborating on solving these files one at a time. 
							
						 | 
						
							2020-05-29 13:43:38 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								97ba63424f
								
							
						 | 
						
							
							
								
								Support for http downloads
							
							
							
							
							
							
							
							(cherry picked from commit 5e0eca9fe9)
(cherry picked just the libcurl stuff) 
							
						 | 
						
							2020-05-13 17:25:52 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sally Coolatta
								
							 
						 | 
						
							
							
							
							
								
							
							
								15d18640de
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'public/master' into merge-12
							
							
							
							
							
						 | 
						
							2020-05-12 03:16:14 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wolfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a264ffba9
								
							
						 | 
						
							
							
								
								Merge branch 'http-downloads' into 'awful-mix'
							
							
							
							
							
							
							
							Support for http downloads
See merge request SinnamonLat/Kart-Public!1 
							
						 | 
						
							2020-04-12 21:38:33 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								eafa6a53a7
								
							
						 | 
						
							
							
								
								Fix even more build errors
							
							
							
							
							
						 | 
						
							2020-04-07 19:14:27 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e0eca9fe9
								
							
						 | 
						
							
							
								
								Support for http downloads
							
							
							
							
							
						 | 
						
							2020-04-07 18:22:29 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								3bbefcfbe5
								
							
						 | 
						
							
							
								
								Debian libopenmpt0 name fix
							
							
							
							
							
						 | 
						
							2019-12-07 20:32:04 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c9e505778
								
							
						 | 
						
							
							
								
								Debian packaging fixes, libopenmpt
							
							
							
							
							
						 | 
						
							2019-12-07 15:50:48 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Latapostrophe
								
							 
						 | 
						
							
							
							
							
								
							
							
								a35cea9243
								
							
						 | 
						
							
							
								
								chaos conflict
							
							
							
							
							
						 | 
						
							2019-06-11 17:02:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									TehRealSalt
								
							 
						 | 
						
							
							
							
							
								
							
							
								09da50000e
								
							
						 | 
						
							
							
								
								Merge branch 'next' into music-credits
							
							
							
							
							
						 | 
						
							2019-01-09 03:08:20 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								7024d89e94
								
							
						 | 
						
							
							
								
								Fix dh_link for srb2kart debian symlink
							
							
							
							
							
						 | 
						
							2018-12-30 21:14:41 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								85ae6f9b74
								
							
						 | 
						
							
							
								
								Add kart to tar-ignore
							
							
							
							
							
						 | 
						
							2018-12-30 15:52:58 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								337e0da8e4
								
							
						 | 
						
							
							
								
								Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge]
							
							
							
							
							
						 | 
						
							2018-12-30 15:41:58 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e2d757219
								
							
						 | 
						
							
							
								
								Implement deployer scripts for Travis -- OSX and Linux package building
							
							
							
							
							
						 | 
						
							2018-12-30 15:22:50 -05:00 | 
						
						
							
							
							
								
							
							
						 |