# HG changeset patch
# User Ritor1
# Date 1361882885 -21600
# Node ID 9b4bdf6089afef8078f847ba33444aa259d5f139
# Parent  81410c3feebcdf06d7794eac026b881715d703ba# Parent  5b6e2021c6fefdbc96bc6c55e1d68d9f6cf847d8
Слияние

diff -r 5b6e2021c6fe -r 9b4bdf6089af Player.cpp
diff -r 5b6e2021c6fe -r 9b4bdf6089af mm7_4.cpp
--- a/mm7_4.cpp	Tue Feb 26 17:24:53 2013 +0600
+++ b/mm7_4.cpp	Tue Feb 26 18:48:05 2013 +0600
@@ -9370,6 +9370,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;