Mercurial > mm7

changeset 327:a7f15da53e82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 20 Feb 2013 11:27:06 +0600
parents ead95219160c (diff) d720a13e2273 (current diff)
children 8e23edf57e27
files mm7_2.cpp
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Wed Feb 20 08:23:12 2013 +0200
+++ b/Player.cpp	Wed Feb 20 11:27:06 2013 +0600
@@ -4054,6 +4054,7 @@
   }
   return result;
 }
+
 // 48DCF6: using guessed type char var_94[140];
 
 //----- (0048E1A3) --------------------------------------------------------
--- a/mm7_2.cpp	Wed Feb 20 08:23:12 2013 +0200
+++ b/mm7_2.cpp	Wed Feb 20 11:27:06 2013 +0600
@@ -12916,7 +12916,6 @@
 
   ReleaseDC(nullptr, hDesktopDC);
 
-
   uint uTotalWinWidth = 2 * GetSystemMetrics(SM_CXFRAME) + 640;
   uint uTotalWinHeight = GetSystemMetrics(SM_CYCAPTION) + 2 * GetSystemMetrics(SM_CYFRAME) + 480;