changeset 261:c3bfe1eb3de7

Слияние
author Ritor1
date Mon, 18 Feb 2013 10:30:14 +0600
parents b89ee5d926dd (diff) 83f85ab6079a (current diff)
children 2d6dda2e0405
files mm7_3.cpp
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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" />
--- 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()
 {