# HG changeset patch
# User Серик@ПончиК
# Date 1349791224 -21600
# Node ID 82f81d5b722179f7ffba4f6078dffab0af596d38
# Parent  ca90d9e499b3eda43088878e958ba2b864068651# Parent  ac0fb48cd27aacc053595cfe758692112662e53f
Слияние

diff -r ac0fb48cd27a -r 82f81d5b7221 Might and Magic Trilogy.suo
Binary file Might and Magic Trilogy.suo has changed
diff -r ac0fb48cd27a -r 82f81d5b7221 Might and Magic Trilogy.vcxproj.user
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Might and Magic Trilogy.vcxproj.user	Tue Oct 09 20:00:24 2012 +0600
@@ -0,0 +1,7 @@
+<?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\Проект Средневековье\Средневековье</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
\ No newline at end of file