# HG changeset patch
# User Ritor1
# Date 1361161814 -21600
# Node ID c3bfe1eb3de7acd74cdb9597e5c62f6c4089a190
# Parent  b89ee5d926dd68866cb9b64af69c980a11b2c81f# Parent  83f85ab6079a25339fd2bf35fc03356d6d964f55
Слияние

diff -r 83f85ab6079a -r c3bfe1eb3de7 MM7.vcxproj.filters
--- a/MM7.vcxproj.filters	Mon Feb 18 07:26:48 2013 +0200
+++ b/MM7.vcxproj.filters	Mon Feb 18 10:30:14 2013 +0600
@@ -317,7 +317,9 @@
     <ClCompile Include="FrameTableInc.cpp" />
     <ClCompile Include="mm7_6.cpp" />
     <ClCompile Include="GameUIs.cpp" />
+    <ClCompile Include="StorylineTextTable.cpp" />
     <ClCompile Include="texts.cpp" />
+    <ClCompile Include="mm7text_ru.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Might and Magic Trilogy.rc" />
diff -r 83f85ab6079a -r c3bfe1eb3de7 mm7_3.cpp
--- a/mm7_3.cpp	Mon Feb 18 07:26:48 2013 +0200
+++ b/mm7_3.cpp	Mon Feb 18 10:30:14 2013 +0600
@@ -16212,7 +16212,6 @@
     return pNPCTopics[407].pTopic;
 }
 
-
 //----- (00445350) --------------------------------------------------------
 void __cdecl DrawDialogueUI()
 {