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

2018-06-25 18:57:48 +01:00

..

ai

(svn r27993) -Change: Heading for 1.9 now

2018-03-14 19:36:41 +00:00

baseset

Merge branch 'master' into jgrpp

2018-06-25 18:57:48 +01:00

data

Merge branch 'tracerestrict-sx' into jgrpp

2015-08-20 00:39:26 +01:00

game

(svn r27993) -Change: Heading for 1.9 now

2018-03-14 19:36:41 +00: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