Jonathan G Rennison 3adeff1883 Merge branch 'master' into jgrpp ...

# Conflicts:
#	CMakeLists.txt
#	cmake/CompileFlags.cmake
#	src/bridge_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/town_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/toolbar_gui.cpp
#	src/town.h
#	src/town_cmd.cpp

2020-06-30 21:43:04 +01:00

..

palettes

(svn r20490) -Change: merge the extra GRF sources so updating them becomes a bit easier.

2010-08-14 14:50:06 +00:00

admin_network.md

Doc: Acknowledge integer type mismatch in certain admin packets using AdminUpdateType (#8238)

2020-06-27 18:21:17 +02:00

compiling_lang_files.md

Doc: rename HOWTO_compile_lang_files.md

2019-10-20 17:41:17 +01:00

debugging_desyncs.md

Doc: revised README to be more helpful to casual GitHub visitors

2019-11-13 20:40:18 +01:00

desync.md

Doc: rename the modified files

2019-10-20 17:12:54 +01:00

directory_structure.md

Doc: revised README to be more helpful to casual GitHub visitors

2019-11-13 20:40:18 +01:00

elrail_tile.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

elrail_track.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

elrail.svg

(svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas.

2006-03-29 16:30:26 +00:00

jgrpp-low-level-changes.md

Cleanup: Fix typo in jgrpp-low-level-changes.md

2020-06-28 21:57:02 +01:00

landscape_externals.html

(svn r20633) -Cleanup: and clarify some bits in the landscape documentation and make them pass the validator again.

2010-08-27 10:42:48 +00:00

landscape_grid.html

Add rail ground type support for rail custom bridge heads

2020-05-19 00:41:35 +01:00

landscape.html

Add rail ground type support for rail custom bridge heads

2020-05-19 00:41:35 +01:00

linkgraph.md

Doc: rename the modified files

2019-10-20 17:12:54 +01:00

logging_and_performance_metrics.md

Feature: NewGRF callback profiling (#7868)

2020-01-26 13:45:51 +01:00

multiplayer.md

Doc: rename the modified files

2019-10-20 17:12:54 +01:00

newgrf-additions.html

Documentation: NewGRF: Fix grammar issue

2020-04-05 11:09:37 +01:00

obg_format.txt

(svn r23000) -Feature: Base graphics sets can now specify a preferred blitter which OpenTTD uses to decide which blitter to load.

2011-10-04 21:35:47 +00:00

obm_format.txt

Update: Document DOS music loading

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

obs_format.txt

(svn r17845) -Fix (r17744): Missing 'g' in sed command.

2009-10-22 16:01:28 +00:00

openttd.6

(svn r27091) -Fix [FS#6170] (r27012): Make manpage more portable. (bentley)

2014-12-24 16:53:04 +00:00

ottd-colourtext-palette.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00

tileh.png

(svn r21264) -Change: compress some PNGs more efficiently

2010-11-20 12:11:11 +00:00