changeset 184:428cbb33872c

Слияние
author Ritor1
date Fri, 15 Feb 2013 18:34:53 +0600
parents 27573ee0d434 (diff) c5bd7a825ef2 (current diff)
children 16d257ffc802
files mm7_2.cpp
diffstat 2 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
 {
--- 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) --------------------------------------------------------