# HG changeset patch
# User Ritor1
# Date 1367930718 -21600
# Node ID 99ee5e590b16624af5bdb730a0737e94b5f9f8ae
# Parent  a6510526f791cc0e2658b7a3610c21303ba90d2b# Parent  0423c40d7e88dae57deaf699c67938fcc6bb533c
Слияние

diff -r 0423c40d7e88 -r 99ee5e590b16 mm7_2.cpp
diff -r 0423c40d7e88 -r 99ee5e590b16 mm7_4.cpp
--- a/mm7_4.cpp	Tue May 07 17:32:23 2013 +0600
+++ b/mm7_4.cpp	Tue May 07 18:45:18 2013 +0600
@@ -1950,7 +1950,6 @@
   }
   return result;
 }
-
 //----- (004938D1) --------------------------------------------------------
 void __fastcall Rest(unsigned int uHoursToSleep)
 {