# HG changeset patch
# User Ritor1
# Date 1363350546 -21600
# Node ID 08b6d89d6a10ec60295d982a2ad6b4a7e578e224
# Parent  d4497b76a8634f4316f7d8e765d5be618120379f# Parent  551f74425b17cea37272e5c7fffbec8135815a27
Слияние

diff -r 551f74425b17 -r 08b6d89d6a10 Indoor.cpp
diff -r 551f74425b17 -r 08b6d89d6a10 UIHouses.cpp
--- a/UIHouses.cpp	Fri Mar 15 04:17:54 2013 +0200
+++ b/UIHouses.cpp	Fri Mar 15 18:29:06 2013 +0600
@@ -355,7 +355,6 @@
 }
 
 
-
 //----- (0044622E) --------------------------------------------------------
 bool  EnterHouse(enum HOUSE_ID uHouseID)
 	{
diff -r 551f74425b17 -r 08b6d89d6a10 stru10.cpp