# HG changeset patch
# User Ritor1
# Date 1375466431 -21600
# Node ID 6de9c1316852a86c09eea9e7ff15819d6a98701b
# Parent  7b1a942707561f43b3c8ffb9cef48e51a69c0b5e# Parent  a6d966e8561167d2f25a1454bbcf06cdcb8d61cd
Слияние

diff -r a6d966e85611 -r 6de9c1316852 Chest.cpp
diff -r a6d966e85611 -r 6de9c1316852 Indoor.cpp
diff -r a6d966e85611 -r 6de9c1316852 Outdoor_stuff.h
diff -r a6d966e85611 -r 6de9c1316852 Render.cpp
diff -r a6d966e85611 -r 6de9c1316852 UI/Books/UIMapBook.cpp
--- a/UI/Books/UIMapBook.cpp	Fri Aug 02 19:28:59 2013 +0200
+++ b/UI/Books/UIMapBook.cpp	Sat Aug 03 00:00:31 2013 +0600
@@ -33,8 +33,6 @@
 
 
 
-
-
 //----- (00411150) --------------------------------------------------------
 void BookUI_DrawTownPortalMap()
 {
diff -r a6d966e85611 -r 6de9c1316852 UI/UIHouses.cpp
--- a/UI/UIHouses.cpp	Fri Aug 02 19:28:59 2013 +0200
+++ b/UI/UIHouses.cpp	Sat Aug 03 00:00:31 2013 +0600
@@ -4435,6 +4435,7 @@
     a1.DrawText(v47, 13, 354 - v48, 0, v49, 0, 0, 0);
   }
 }
+
 //----- (004B4F4F) --------------------------------------------------------
 void JailDialog()
 {
diff -r a6d966e85611 -r 6de9c1316852 mm7_2.cpp
diff -r a6d966e85611 -r 6de9c1316852 mm7_3.cpp