4 Commits

Author	SHA1	Message	Date
Jonathan G Rennison	62afd94b47	Merge branch 'master' into jgrpp-beta ... # Conflicts: # src/company_cmd.cpp # src/economy.cpp # src/lang/swedish.txt # src/network/network_command.cpp # src/news_gui.cpp # src/saveload/saveload.h # src/script/api/script_list.cpp # src/video/cocoa/cocoa_v.mm # src/video/sdl2_v.cpp	2021-11-01 18:54:43 +00:00
Rubidium	f904aef176	Cleanup: use nullptr instead of 0 or NULL	2021-06-17 16:18:30 +02:00
rubidium42	55a11710a6	Codechange: convert printf DEBUG statements to fmt Debug statements	2021-06-13 12:45:45 +02:00
Michael Lutz	63ed3f3575	Codechange: Move Fontconfig-specific code to a seperate file.	2021-02-13 20:09:14 +01:00