# HG changeset patch
# User Lower
# Date 1350139094 -21600
# Node ID f810c4366a77d3c25288dfe66e0c5cff42190b33
# Parent  f88cff4887c84f50799ea7909aa19df059a383a1# Parent  e33334611747c8cb416e8d079f22ff2d56909281
Слияние

diff -r e33334611747 -r f810c4366a77 Might and Magic Trilogy.suo
Binary file Might and Magic Trilogy.suo has changed
diff -r e33334611747 -r f810c4366a77 Might and Magic Trilogy.vcxproj.user
--- a/Might and Magic Trilogy.vcxproj.user	Sat Oct 13 17:10:23 2012 +0200
+++ b/Might and Magic Trilogy.vcxproj.user	Sat Oct 13 20:38:14 2012 +0600
@@ -1,8 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>..\Games\MM7</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>-nocd</LocalDebuggerCommandArguments>
-  </PropertyGroup>
 </Project>
\ No newline at end of file