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 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
9 years ago
..
ai (svn r27192) -Change: heading for 1.6 now 9 years ago
baseset (svn r27266) -Fix (r27265): Eddi jinxed it. 9 years ago
data Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 9 years ago
game (svn r27192) -Change: heading for 1.6 now 9 years ago
scripts (svn r15302) -Add: example file for on_server_connect.scr and document it in the scripts readme 16 years ago