# HG changeset patch
# User Ritor1
# Date 1369323442 -21600
# Node ID 37498d2cceedfdd3aea62bd183765286c0c605e1
# Parent  86a7e8f9ca33ca5b334c313da0a8378fa2900201# Parent  d48c762de5632fbec372cb833345f9f4f441f9ad
Слияние

diff -r d48c762de563 -r 37498d2cceed Vis.cpp
--- a/Vis.cpp	Thu May 23 18:26:05 2013 +0200
+++ b/Vis.cpp	Thu May 23 21:37:22 2013 +0600
@@ -1261,7 +1261,6 @@
   return true;
 }
 
-
 //----- (004C04AF) --------------------------------------------------------
 Vis::Vis()
 {
diff -r d48c762de563 -r 37498d2cceed mm7_5.cpp