Merge branch 'house_placing' into jgrpp

Browse Source

# Conflicts:
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/town_gui.cpp

...

This commit is contained in:

Jonathan G Rennison

2016-04-08 20:15:08 +01:00

parent 0d26da998b 6ebea4b49c

commit 41a06e698f

32 changed files with 1401 additions and 706 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

818

src/town_gui.cpp

File diff suppressed because it is too large Load Diff