Jonathan G Rennison 62afd94b47 Merge branch 'master' into jgrpp-beta ...

# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp

2021-11-01 18:54:43 +00:00

..

npf

Merge branch 'master' into jgrpp-beta

2021-11-01 18:54:43 +00:00

yapf

Merge branch 'jgrpp' into jgrpp-beta

2021-10-08 18:12:04 +01:00

CMakeLists.txt

Remove: performance measurements in YAPF

2021-04-30 18:04:57 +01:00

follow_track.hpp

Remove: performance measurements in YAPF

2021-04-30 18:04:57 +01:00

pathfinder_func.h

Fix #8123: trams on half-tiles couldn't find depots (#8738)

2021-02-25 22:46:46 +01:00

pathfinder_type.h

Merge branch 'master' into jgrpp

2020-02-09 15:43:47 +00:00