# HG changeset patch
# User Ritor1
# Date 1361548075 -21600
# Node ID 4a60371fd70ce1c2a995ef3b00187c14144d759e
# Parent  6c3f8694005fd7594735d70a798361fb08a7e100# Parent  edd2d8b7e3c42c789159698ce8931bc1a7f878b9
Слияние

diff -r edd2d8b7e3c4 -r 4a60371fd70c Party.cpp
--- a/Party.cpp	Fri Feb 22 18:40:38 2013 +0200
+++ b/Party.cpp	Fri Feb 22 21:47:55 2013 +0600
@@ -780,7 +780,6 @@
 }
 
 
-
 //----- (0043AD34) --------------------------------------------------------
 void Party::Yell()
 {
diff -r edd2d8b7e3c4 -r 4a60371fd70c mm7_4.cpp
--- a/mm7_4.cpp	Fri Feb 22 18:40:38 2013 +0200
+++ b/mm7_4.cpp	Fri Feb 22 21:47:55 2013 +0600
@@ -14989,7 +14989,6 @@
 
 
 
-
 //----- (0044622E) --------------------------------------------------------
 bool __fastcall EnterHouse(HOUSE_TYPE uHouseID)
 {