Merge branch 'house_placing' into jgrpp

# Conflicts: # src/settings_gui.cpp # src/settings_type.h # src/town_gui.cpp
2016-04-08 20:15:08 +01:00
parent 0d26da998b 6ebea4b49c
commit 41a06e698f
32 changed files with 1401 additions and 706 deletions
--- a/source.list
+++ b/source.list
@@ -391,7 +391,6 @@ tilematrix_type.hpp
 timetable.h
 toolbar_gui.h
 town.h
-town_gui.h
 town_type.h
 townname_func.h
 townname_type.h