Jonathan G Rennison c20cf31514 Merge branch 'cpp-11' into enhanced_viewport_overlay ...

# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp

2016-09-10 00:57:05 +01:00

..

ai

(svn r27518) -Update: Numbers

2016-03-01 20:00:22 +00:00

baseset

(svn r27619) -Update: Baseset translations

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

data

Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

2015-08-05 21:24:30 +01:00

game

(svn r27518) -Update: Numbers

2016-03-01 20:00:22 +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