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 828d2146eb Merge branch 'master' into jgrpp ... # Conflicts: # CMakeLists.txt # bin/ai/CMakeLists.txt # bin/game/CMakeLists.txt # src/ai/ai_info.cpp # src/company_base.h # src/economy.cpp # src/game/game_info.cpp # src/gfx_type.h # src/linkgraph/linkgraph_gui.cpp # src/palette.cpp # src/palette_func.h # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle_base.h # src/window.cpp # src/window_func.h		3 months ago
..
CMakeLists.txt	…
demands.cpp	Link graph: Use non-sparse matrix for accumulating demand totals	4 months ago
demands.h	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
flowmapper.cpp	Change link graph join and compression times to use scaled tick counter	3 months ago
flowmapper.h	Codechange: Add missing override specifiers.	8 months ago
init.h	Codechange: Add missing override specifiers.	8 months ago
linkgraph.cpp	Clamp link graph compression ticks when loading old saves	3 months ago
linkgraph.h	Change link graph join and compression times to use scaled tick counter	3 months ago
linkgraph_base.h	Codechange: [Linkgraph] Drop node/edge wrappers from LinkGraph.	1 year ago
linkgraph_gui.cpp	Merge branch 'master' into jgrpp	3 months ago
linkgraph_gui.h	Fix mismatch between struct Blitter and class Blitter declarations	4 months ago
linkgraph_type.h	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
linkgraphjob.cpp	Change link graph join and compression times to use scaled tick counter	3 months ago
linkgraphjob.h	Change link graph join and compression times to use scaled tick counter	3 months ago
linkgraphjob_base.h	Codechange: [Linkgraph] Drop node/edge wrappers from LinkGraphJob.	1 year ago
linkgraphschedule.cpp	Change link graph join and compression times to use scaled tick counter	3 months ago
linkgraphschedule.h	Codechange: Split dates and timers into Economy and Calendar time (#10700)	4 months ago
mcf.cpp	Merge branch 'master' into jgrpp	4 months ago
mcf.h	Merge branch 'master' into jgrpp	6 months ago
refresh.cpp	Merge branch 'master' into jgrpp	4 months ago
refresh.h	Merge branch 'master' into jgrpp	4 months ago