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.
OpenTTD-patches/src/misc
Jonathan G Rennison 2a31095118 Merge branch 'master' into jgrpp
# Conflicts:
#	regression/regression/result.txt
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/console_cmds.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/hotkeys.cpp
#	src/network/core/tcp_connect.cpp
#	src/network/core/tcp_listen.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_engine.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_station.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/macosx/osx_main.cpp
#	src/pathfinder/yapf/yapf_node_rail.hpp
#	src/rail_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_industrytype.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/strings.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_game_calendar.h
#	src/timer/timer_manager.h
#	src/timer/timer_window.cpp
#	src/timetable_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/vehicle_cmd.h
#	src/vehicle_gui.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_func.h
#	src/window_gui.h
6 months ago
..
CMakeLists.txt Change: [Network] Transfer command data as serialized byte stream without fixed structure. 2 years ago
array.hpp Codechange: use std::string for parameters in the dbg_helpers 1 year ago
binaryheap.hpp Fix: Globally apply preprocessor directive coding style 4 years ago
countedobj.cpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
countedptr.hpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
dbg_helpers.cpp Merge branch 'master' into jgrpp 6 months ago
dbg_helpers.h Codechange: use std::string for parameters in the dbg_helpers 1 year ago
fixedsizearray.hpp Codechange: Replace assert_compile macro with static_assert 3 years ago
getoptdata.cpp Cleanup: Removed SVN headers 5 years ago
getoptdata.h Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
hashtable.hpp Codechange: automatic adding of _t to (u)int types, and WChar to char32_t 11 months ago
lrucache.hpp Codechange: Move includes for common STL headers to stdafx. 1 year ago