changeset 396:4a60371fd70c

Слияние
author Ritor1
date Fri, 22 Feb 2013 21:47:55 +0600
parents 6c3f8694005f (diff) edd2d8b7e3c4 (current diff)
children 5fd328336048
files Party.cpp mm7_4.cpp
diffstat 2 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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()
 {
--- 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)
 {