# HG changeset patch
# User Ritor1
# Date 1363179270 -21600
# Node ID ee978b573798a0bdb7092c1c034b9620429c8ab8
# Parent  b54755fa0dbc0623a0229257a15e00f906ca3aad# Parent  a5750c94b0222169ff9797cc90a0fb58553b5f6d
Слияние

diff -r a5750c94b022 -r ee978b573798 Indoor.cpp
--- a/Indoor.cpp	Wed Mar 13 17:08:21 2013 +0600
+++ b/Indoor.cpp	Wed Mar 13 18:54:30 2013 +0600
@@ -1444,7 +1444,6 @@
   }
 }
 
-
 //----- (004AFB86) --------------------------------------------------------
 void BspRenderer::AddFaceToRenderList_sw(int a2, unsigned int uFaceID)
 {
diff -r a5750c94b022 -r ee978b573798 UIHouses.cpp
--- a/UIHouses.cpp	Wed Mar 13 17:08:21 2013 +0600
+++ b/UIHouses.cpp	Wed Mar 13 18:54:30 2013 +0600
@@ -355,7 +355,6 @@
 }
 
 
-
 //----- (0044622E) --------------------------------------------------------
 bool  EnterHouse(enum HOUSE_ID uHouseID)
 	{