Jonathan G Rennison 0a9c44d1a2 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_anim_sse4.cpp
#	src/console_cmds.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/newgrf_object.h
#	src/road_gui.cpp
#	src/widgets/road_widget.h
#	src/window.cpp

2022-10-16 20:14:13 +01:00

..

ai

Merge branch 'master' into jgrpp

2022-10-16 20:14:13 +01:00

game

Merge branch 'master' into jgrpp

2022-10-16 20:14:13 +01:00

scripts

(svn r15302) -Add: example file for on_server_connect.scr and document it in the scripts readme

2009-01-31 23:50:53 +00:00

CMakeLists.txt

Change: [CMake] Copy AI/GS compatibility files to build dir (#8906)

2021-04-02 10:15:45 +02:00