Jonathan G Rennison 36eb4165b8 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h

2019-07-08 16:19:07 +01:00

..

ai_config.cpp

Codechange: Use null pointer literal instead of the NULL macro

2019-04-10 23:22:20 +02:00

ai_config.hpp

Codechange: Use override specifer for overriding member declarations

2019-03-24 16:10:04 +01:00

ai_core.cpp

Merge branch 'master' into jgrpp

2019-07-08 16:19:07 +01:00

ai_gui.cpp

Codechange: Remove Company/OwnerByte types

2019-04-29 17:40:22 +01:00

ai_gui.hpp

(svn r24554) -Add: Hotkeys for widgets in AI Debug window

2012-09-23 14:37:59 +00:00

ai_info.cpp

Codechange: Use null pointer literal instead of the NULL macro

2019-04-10 23:22:20 +02:00

ai_info.hpp

Codechange: Use null pointer literal instead of the NULL macro

2019-04-10 23:22:20 +02:00

ai_instance.cpp

Codechange: Use null pointer literal instead of the NULL macro

2019-04-10 23:22:20 +02:00

ai_instance.hpp

Codechange: Use override specifer for overriding member declarations

2019-03-24 16:10:04 +01:00

ai_scanner.cpp

Codechange: Use null pointer literal instead of the NULL macro

2019-04-10 23:22:20 +02:00

ai_scanner.hpp

Codechange: Use null pointer literal instead of the NULL macro

2019-04-10 23:22:20 +02:00

ai.hpp

Remove: ENABLE_NETWORK switch

2019-03-20 19:24:55 +01:00