# HG changeset patch
# User Ritor1
# Date 1379513089 -21600
# Node ID 4bbb80c7dba7c254d93648044bfb01f2ab319fbc
# Parent  014eb02bd0e62e3f9382be97489f77e0da07ccca# Parent  c586fa9e4cbb30a6d463e018ffb8c502ee2725d5
Merge

diff -r c586fa9e4cbb -r 4bbb80c7dba7 UI/UIHouses.cpp
diff -r c586fa9e4cbb -r 4bbb80c7dba7 UI/UIMainMenu.cpp