You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		3 years ago
..
CMakeLists.txt	Add: [OSX] Native font rendering without using FreeType.	3 years ago
G5_detector.cpp	Cleanup: Removed SVN headers	5 years ago
crashlog_osx.cpp	Add CheckCaches mode to emit a log/save/screenshot on detected issue	3 years ago
font_osx.cpp	Merge branch 'jgrpp' into jgrpp-beta	3 years ago
font_osx.h	Add: [OSX] Native font rendering without using FreeType.	3 years ago
macos.h	Cleanup: Removed SVN headers	5 years ago
macos.mm	Codechange: [OSX] Use more exact enum names where introduced with the 10.12 SDK.	3 years ago
osx_stdafx.h	Merge branch 'master' into jgrpp-beta	3 years ago
string_osx.cpp	Merge branch 'master' into jgrpp	3 years ago
string_osx.h	Fix: [OSX] Fonts loaded directly from a file have to be registered with CoreText for proper text layout.	3 years ago