Jonathan G Rennison 281d346fe2 Merge branch 'master' into jgrpp ... # Conflicts: # bin/baseset/no_sound.obs # bin/baseset/orig_dos.obg # bin/baseset/orig_dos.obs # bin/baseset/orig_dos_de.obg # bin/baseset/orig_win.obg # bin/baseset/orig_win.obm # bin/baseset/orig_win.obs # src/aircraft_cmd.cpp # src/blitter/32bpp_anim.cpp # src/blitter/32bpp_anim.hpp # src/blitter/32bpp_base.cpp # src/blitter/32bpp_base.hpp # src/blitter/8bpp_base.cpp # src/blitter/8bpp_base.hpp # src/blitter/common.hpp # src/group_gui.cpp # src/lang/korean.txt # src/linkgraph/linkgraph_gui.cpp # src/saveload/saveload.cpp # src/town_cmd.cpp # src/viewport.cpp # src/viewport_func.h		2019-01-29 02:28:14 +00:00
..
palettes
admin_network.txt
desync.txt	(svn r26788) -Add: Desync replay option to skip/replay failed commands	2014-09-07 14:21:16 +00:00
elrail_tile.png
elrail_track.png
elrail.svg
HOWTO_compile_lang_files.txt	Doc: replace 4 references to SVN with Git #6698 (#7036)	2019-01-11 13:41:12 +01:00
landscape_externals.html
landscape_grid.html	Docs: Fix error in landscape_grid.html: class 9 bridge ramp m6	2019-01-19 15:34:04 +00:00
landscape.html	Initial implementation of two rail types per tile	2018-12-21 03:27:58 +00:00
linkgraph.txt
multiplayer.txt	Doc: Fix a few typos in docs/multiplayer.txt	2019-01-10 22:14:23 +00:00
newgrf-additions.html	Add Action 5 support for programmable signals graphics	2018-11-28 02:53:51 +00:00
obg_format.txt
obm_format.txt	Update: Document DOS music loading	2018-06-05 22:58:35 +02:00
obs_format.txt
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
Readme_OS2.txt
Readme_Windows_MSVC.md	Add: Visual Studio 2019 project files	2019-01-26 14:56:35 +01:00
tileh.png