# HG changeset patch
# User Серик@ПончиК
# Date 1349886637 -21600
# Node ID 5983336e1300870f2332bf389c3aff75da5cb0db
# Parent  fd8c1724b4eb12599d17946720441ff853607236# Parent  540178ef9b18cf3d1f1107eb755d91b86ce626f6
Слияние

diff -r 540178ef9b18 -r 5983336e1300 Might and Magic Trilogy.suo
Binary file Might and Magic Trilogy.suo has changed
diff -r 540178ef9b18 -r 5983336e1300 Might and Magic Trilogy.vcxproj.user
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Might and Magic Trilogy.vcxproj.user	Wed Oct 10 22:30:37 2012 +0600
@@ -0,0 +1,8 @@
+<?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\MM7Games\MM7</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>-nocd</LocalDebuggerCommandArguments>
+  </PropertyGroup>
+</Project>
\ No newline at end of file