| 
							
							
								 Jonathan G Rennison | adf2210bc8 | Merge branch 'master' into jgrpp # Conflicts:
#	src/genworld_gui.cpp
#	src/lang/afrikaans.txt
#	src/lang/arabic_egypt.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/esperanto.txt
#	src/lang/estonian.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/frisian.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/malay.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.txt
#	src/lang/persian.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/saveload/afterload.cpp | 2023-01-12 20:59:34 +00:00 |  | 
			
				
					| 
							
							
								 blschachte | 6b68de1f3e | Doc: Fix typo in COMPILING.md (#10329) | 2023-01-07 17:32:25 +00:00 |  | 
			
				
					| 
							
							
								 Jonathan G Rennison | 2f8e63e954 | Merge branch 'master' into jgrpp # Conflicts:
#	src/gfx.cpp
#	src/lang/traditional_chinese.txt
#	src/station_cmd.cpp | 2022-01-04 17:42:36 +00:00 |  | 
			
				
					| 
							
							
								 benda | 30d0f06890 | Doc: use only double quotes for cmake command line example in  COMPILING.md (#9758) While powershell happily accepts single quotes, it's not the case for cmd. | 2021-12-22 19:32:48 +01:00 |  | 
			
				
					| 
							
							
								 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 |  |