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

2015-08-05 21:54:11 +01:00

..

ai

(svn r27192) -Change: heading for 1.6 now

2015-03-17 20:33:44 +00:00

baseset

(svn r27266) -Fix (r27265): Eddi jinxed it.

2015-05-03 10:30:02 +00:00

data

Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

2015-08-05 21:54:11 +01:00

game

(svn r27192) -Change: heading for 1.6 now

2015-03-17 20:33:44 +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