# HG changeset patch
# User Ritor1
# Date 1360931693 -21600
# Node ID 428cbb33872cc4e6293e857c49cd754c7f446ca4
# Parent  27573ee0d4340d6f9ad6d75a67a51bbe0cbbb8b2# Parent  c5bd7a825ef2ccd0ccbe0a7e13fef65427967686
Слияние

diff -r c5bd7a825ef2 -r 428cbb33872c Vis.cpp
--- a/Vis.cpp	Fri Feb 15 17:22:20 2013 +0600
+++ b/Vis.cpp	Fri Feb 15 18:34:53 2013 +0600
@@ -1581,9 +1581,6 @@
   uNumPointers = 0;
 }
 
-
-
-
 //----- (004C05CC) --------------------------------------------------------
 bool Vis::PickKeyboard(Vis_stru1 *a2, stru157 *a3, stru157 *a4)
 {
diff -r c5bd7a825ef2 -r 428cbb33872c mm7_2.cpp
--- a/mm7_2.cpp	Fri Feb 15 17:22:20 2013 +0600
+++ b/mm7_2.cpp	Fri Feb 15 18:34:53 2013 +0600
@@ -13881,7 +13881,6 @@
 
 
 
-
 bool new_sky = false;
 
 //----- (00462C94) --------------------------------------------------------