# HG changeset patch
# User Ritor1
# Date 1379302650 -21600
# Node ID 2149b14614ad1079a3d188efd9d1fb59b398c812
# Parent  7ce831a2a393968e2d92b2842acf9b10617697e1# Parent  2d374de0a364d88890ccb1d736f0d793c4f5f076
Слияние

diff -r 2d374de0a364 -r 2149b14614ad UI/UIHouses.cpp