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 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		5 years ago
..
ai.hpp	Remove: ENABLE_NETWORK switch	5 years ago
ai_config.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
ai_config.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
ai_core.cpp	Merge branch 'master' into jgrpp	5 years ago
ai_gui.cpp	Codechange: Remove Company/OwnerByte types	5 years ago
ai_gui.hpp	(svn r24554) -Add: Hotkeys for widgets in AI Debug window	12 years ago
ai_info.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
ai_info.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
ai_instance.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
ai_instance.hpp	Codechange: Use override specifer for overriding member declarations	5 years ago
ai_scanner.cpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago
ai_scanner.hpp	Codechange: Use null pointer literal instead of the NULL macro	5 years ago