Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						3e6b06f7b0 
					 
					
						
						
							
							CPack: Change debian package name, mark as conflicting with openttd  
						
						
						
						
					 
					
						2021-03-13 12:00:40 +00:00 
						 
				 
			
				
					
						
							
							
								Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						cb69611248 
					 
					
						
						
							
							Merge branch 'master' into jgrpp  
						
						... 
						
						
						
						# Conflicts:
#	.github/changelog.sh
#	cmake/PackageDeb.cmake
#	src/network/network_client.cpp
#	src/settings_gui.cpp 
						
						
					 
					
						2021-01-29 18:27:36 +00:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						2df182748c 
					 
					
						
						
							
							Fix: [CMake] automatically detect dependencies for .deb packages  
						
						
						
						
					 
					
						2020-12-19 18:26:29 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Brooke 
							
						 
					 
					
						
						
							
						
						e0fb398bbd 
					 
					
						
						
							
							Fix: debian package dependencies  
						
						
						
						
					 
					
						2020-07-07 17:13:44 -04:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						b7643b1d36 
					 
					
						
						
							
							Add: create bundles via CPack  
						
						... 
						
						
						
						CPack works closely together with CMake to do the right thing in
terms of bundling (called 'package'). This generates all the
packaging we need, and some more. 
						
						
					 
					
						2020-06-05 19:36:05 +02:00