Mercurial > mm7

changeset 1445:6de9c1316852

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sat, 03 Aug 2013 00:00:31 +0600
parents 7b1a94270756 (diff) a6d966e85611 (current diff)
children 8b4f4c723edd
files Chest.cpp Outdoor_stuff.h Render.cpp UI/Books/UIMapBook.cpp UI/UIHouses.cpp mm7_2.cpp mm7_3.cpp
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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()
 {
--- 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()
 {