From 9a1b910ea32f518b605c88315f192afc6fc40f28 Mon Sep 17 00:00:00 2001 From: Zoryn Date: Thu, 3 Mar 2016 15:06:25 -0500 Subject: resync for merge conflicts --- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 6915 -> 7012 bytes .../Debug/TrainerMod.csproj.FileListAbsolute.txt | 8 ++++++++ .../TrainerMod.csprojResolveAssemblyReference.cache | Bin 75042 -> 79113 bytes TrainerMod/obj/Debug/TrainerMod.dll | Bin 23552 -> 24064 bytes TrainerMod/obj/Debug/TrainerMod.pdb | Bin 34304 -> 34304 bytes 5 files changed, 8 insertions(+) (limited to 'TrainerMod/obj') diff --git a/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f782b8f7..7b09d9e8 100644 Binary files a/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TrainerMod/obj/Debug/TrainerMod.csproj.FileListAbsolute.txt b/TrainerMod/obj/Debug/TrainerMod.csproj.FileListAbsolute.txt index 0b85292c..9a9d9045 100644 --- a/TrainerMod/obj/Debug/TrainerMod.csproj.FileListAbsolute.txt +++ b/TrainerMod/obj/Debug/TrainerMod.csproj.FileListAbsolute.txt @@ -9,3 +9,11 @@ C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\TrainerMod.dll C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\TrainerMod.pdb C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\Stardew Valley.exe C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\obj\Debug\TrainerMod.pdb +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\steam_appid.txt +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\StardewModdingAPI.exe +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\xTile.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\Lidgren.Network.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\Microsoft.Xna.Framework.Xact.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\Steamworks.NET.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\StardewModdingAPI.pdb +C:\Users\zoryn\Documents\GitHub\SMAPI\TrainerMod\bin\Debug\Microsoft.Xna.Framework.Xact.xml diff --git a/TrainerMod/obj/Debug/TrainerMod.csprojResolveAssemblyReference.cache b/TrainerMod/obj/Debug/TrainerMod.csprojResolveAssemblyReference.cache index 13cf99fc..cc53004f 100644 Binary files a/TrainerMod/obj/Debug/TrainerMod.csprojResolveAssemblyReference.cache and b/TrainerMod/obj/Debug/TrainerMod.csprojResolveAssemblyReference.cache differ diff --git a/TrainerMod/obj/Debug/TrainerMod.dll b/TrainerMod/obj/Debug/TrainerMod.dll index bcf663ab..d39f4375 100644 Binary files a/TrainerMod/obj/Debug/TrainerMod.dll and b/TrainerMod/obj/Debug/TrainerMod.dll differ diff --git a/TrainerMod/obj/Debug/TrainerMod.pdb b/TrainerMod/obj/Debug/TrainerMod.pdb index 21f85abf..e20c53af 100644 Binary files a/TrainerMod/obj/Debug/TrainerMod.pdb and b/TrainerMod/obj/Debug/TrainerMod.pdb differ -- cgit