changeset 682:ee978b573798

Слияние
author Ritor1
date Wed, 13 Mar 2013 18:54:30 +0600
parents b54755fa0dbc (diff) a5750c94b022 (current diff)
children d4497b76a863
files Indoor.cpp UIHouses.cpp
diffstat 2 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
 {
--- 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)
 	{