Mercurial > mm7

changeset 510:7c86030324a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 01 Mar 2013 18:38:12 +0600
parents dddedef7a98e (diff) dd5124185551 (current diff)
children a13d7b95424e
files Player.cpp mm7_1.cpp mm7_3.cpp mm7_4.cpp
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
 {
--- 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;