# HG changeset patch
# User Ritor1
# Date 1361761748 -21600
# Node ID 91e1ba340f39f1267ba072cc0d59e006ea3c16a5
# Parent  e65d7520626397673506d9f188dd8eabd80fcaf3# Parent  62ca9e2e1432c81be5b5d8eef5bd7180ceed42b6
Слияние

diff -r 62ca9e2e1432 -r 91e1ba340f39 mm7_2.cpp
diff -r 62ca9e2e1432 -r 91e1ba340f39 mm7_data.cpp
diff -r 62ca9e2e1432 -r 91e1ba340f39 mm7_data.h
--- a/mm7_data.h	Sun Feb 24 23:44:16 2013 +0600
+++ b/mm7_data.h	Mon Feb 25 09:09:08 2013 +0600
@@ -1005,7 +1005,7 @@
 extern __int16 word_4F0576[]; // weak
 extern __int16 word_4F0578[]; // weak
 extern __int16 word_4F05AE[]; // weak
-extern char _4F063C_smthn_by_2da_uType[]; // weak
+extern char _4F063C_smthn_by_2da_uType[3]; // weak
 extern __int16 word_4F063E[290];
 extern __int16 word_4F06D8[22];
 extern __int16 word_4F0704[40];