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/bin
Jonathan G Rennison 4d1bd8e4b4 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
6 years ago
..
ai (svn r27993) -Change: Heading for 1.9 now 7 years ago
baseset Merge branch 'master' into jgrpp 6 years ago
data Merge branch 'tracerestrict-sx' into jgrpp 9 years ago
game (svn r27993) -Change: Heading for 1.9 now 7 years ago
scripts (svn r15302) -Add: example file for on_server_connect.scr and document it in the scripts readme 16 years ago