# HG changeset patch
# User Ritor1
# Date 1367429814 -21600
# Node ID 840b78f6c2d3ac59b5c66b5ece8ad08ee3620545
# Parent  5e87b0c3f939bbdd2179fc3bc49d76248932f9ad# Parent  c0d0656aa662cede9bb78023831bc4f57dce9566
Слияние

diff -r c0d0656aa662 -r 840b78f6c2d3 mm7_6.cpp
--- a/mm7_6.cpp	Wed May 01 20:04:24 2013 +0200
+++ b/mm7_6.cpp	Wed May 01 23:36:54 2013 +0600
@@ -1184,7 +1184,6 @@
   LOWORD(v2) = (a1 >> 5) & 0x7E0;
   return ((unsigned __int8)a1 >> 3) | v2 | v1;
 }
-
 //----- (00426947) --------------------------------------------------------
 void __cdecl sub_426947()
 {