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

..

no_music.obm

(svn r27773) -Update: Baseset translations

2017-03-11 12:20:50 +00:00

no_sound.obs

(svn r27619) -Update: Baseset translations

2016-07-22 21:25:37 +00:00

openttd.grf

Fix: Four group action icons were misplaced and cropped.

2018-04-17 19:05:35 +02:00

opntitle.dat

(svn r23220) -Change: move the baseset files to their new location

2011-11-14 21:38:36 +00:00

orig_dos_de.obg

(svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC)

2018-03-11 12:03:17 +00:00

orig_dos.obg

(svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC)

2018-03-11 12:03:17 +00:00

orig_dos.obm

Feature: Baseset music for TTD DOS and TTO data

2018-06-05 22:58:35 +02:00

orig_dos.obs

Merge pull request #59 from kiwitreekor

2018-06-21 20:56:56 +01:00

orig_extra.grf

(svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC)

2018-03-11 12:03:17 +00:00

orig_tto.obm

Feature: Baseset music for TTD DOS and TTO data

2018-06-05 22:58:35 +02:00

orig_win.obg

(svn r27977) -Add [FS#6664]: Replace the office building sprite on various toyland airports with a better fitting sprite. This also affects GRFs which activate the default refinery in toyland. (PaulC)

2018-03-11 12:03:17 +00:00

orig_win.obm

Change #6684: Cutting point overrides for music base sets

2018-06-15 23:09:17 +02:00

orig_win.obs

(svn r27745) -Update: Baseset translations

2017-02-12 12:01:03 +00:00