Jonathan G Rennison 1f535915d1 Merge branch 'master' into jgrpp-nrt ...

# Conflicts:
#	config.lib
#	src/core/bitmath_func.hpp
#	src/lang/korean.txt
#	src/main_gui.cpp
#	src/order_gui.cpp
#	src/script/api/script_object.cpp
#	src/station_cmd.cpp
#	src/video/cocoa/wnd_quartz.mm

2019-09-18 01:18:28 +01:00

..

macosx

Merge branch 'master' into jgrpp-nrt

2019-09-18 01:18:28 +01:00

os2

Merge: Codechange: Use null pointer literal instead of the NULL macro

2019-04-11 18:14:13 +01:00

unix

Add flags for mismatch type to client desync log

2019-08-20 22:52:03 +01:00

windows

Merge branch 'jgrpp' into jgrpp-nrt

2019-09-16 22:28:35 +01:00