Merge 1.7.0-RC1

2017-04-09 22:34:33 +03:00
parent 20c478da3f 3433ae02f4
commit 2a02067397
262 changed files with 4673 additions and 3860 deletions
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -1,4 +1,4 @@
-/* $Id: town_gui.cpp 27591 2016-05-29 19:05:11Z frosch $ */
+/* $Id: town_gui.cpp 27577 2016-05-22 10:52:02Z frosch $ */

 /*
 * This file is part of OpenTTD.