Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						253772e9af
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	CMakeLists.txt
#	COMPILING.md
#	src/console.cpp
#	src/console_cmds.cpp
#	src/console_internal.h
#	src/rev.cpp.in 
						
						
					 | 
					
						2021-04-25 02:14:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patric Stout
							
						 
					 | 
					
						
						
							
						
						96b78bc2cd
					 | 
					
						
						
							
							Doc: indicate the most common options for CMake
						
						
						
						
						
						
					 | 
					
						2021-04-21 22:48:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patric Stout
							
						 
					 | 
					
						
						
							
						
						69355293aa
					 | 
					
						
						
							
							Doc: split up which libraries are used for which situation
						
						
						
						
						
						
					 | 
					
						2021-04-21 22:48:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dP
							
						 
					 | 
					
						
						
							
						
						b284d34277
					 | 
					
						
						
							
							Add: Support Zstandard(zstd) savegame compression
						
						
						
						
						
						
						
						(cherry picked from commit 6f0aeaf2c5436550c93205e704624957e9abc969) 
						
						
					 | 
					
						2021-03-01 18:08:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						af0acc9a75
					 | 
					
						
						
							
							Update: Specify CMake minimum version in COMPILING.md
						
						
						
						
						
						
						
						Also give some hints for MSVC users. 
						
						
					 | 
					
						2021-02-07 16:21:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patric Stout
							
						 
					 | 
					
						
						
							
						
						126f40e012
					 | 
					
						
						
							
							Doc: indicate where to find an excellent tutorial on using CMake (#8475)
						
						
						
						
						
						
					 | 
					
						2021-01-02 20:54:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						5d278b62cc
					 | 
					
						
						
							
							Codechange: switch to C++17 on all platforms.
						
						
						
						
						
						
					 | 
					
						2020-12-14 23:50:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patric Stout
							
						 
					 | 
					
						
						
							
						
						945508b854
					 | 
					
						
						
							
							Fix: update COMPILING.md stating what changed with CMake
						
						
						
						
						
						
					 | 
					
						2020-06-05 19:36:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andy
							
						 
					 | 
					
						
						
							
						
						e5f1755629
					 | 
					
						
						
							
							Doc: split compiling instructions from README, as they aren't required for casual GitHub visitors
						
						
						
						
						
						
					 | 
					
						2019-10-19 16:56:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |