# HG changeset patch
# User Ritor1
# Date 1362141492 -21600
# Node ID 7c86030324a58d4e466bebb301f0e59096ad6293
# Parent  dddedef7a98e12972954eb2d14f2b20896b8ab63# Parent  dd5124185551ad14df0aede1cd6ef23c4f4efe2e
Слияние

diff -r dd5124185551 -r 7c86030324a5 Player.cpp
diff -r dd5124185551 -r 7c86030324a5 mm7_1.cpp
diff -r dd5124185551 -r 7c86030324a5 mm7_3.cpp
--- a/mm7_3.cpp	Fri Mar 01 17:38:04 2013 +0600
+++ b/mm7_3.cpp	Fri Mar 01 18:38:12 2013 +0600
@@ -12630,7 +12630,6 @@
   while (++_it != 4);
 }
 
-
 //----- (00441A4E) --------------------------------------------------------
 __int16 __fastcall sub_441A4E(int a1)
 {
diff -r dd5124185551 -r 7c86030324a5 mm7_4.cpp
--- a/mm7_4.cpp	Fri Mar 01 17:38:04 2013 +0600
+++ b/mm7_4.cpp	Fri Mar 01 18:38:12 2013 +0600
@@ -9365,6 +9365,7 @@
 	  v9->uHolderPlayer = v5;
   }
 }
+
 // 4F08EC: using guessed type int dword_4F08EC[];
 // 722B3C: using guessed type int dword_722B3C;
 // 722B44: using guessed type int dword_722B44;