diff options
| author | Zoryn <zoryn4163@gmail.com> | 2016-03-03 15:06:25 -0500 |
|---|---|---|
| committer | Zoryn <zoryn4163@gmail.com> | 2016-03-03 15:06:25 -0500 |
| commit | 9a1b910ea32f518b605c88315f192afc6fc40f28 (patch) | |
| tree | fcc475ef046295a06a2358c7f83cb4e97e38ce9c /TrainerMod/obj | |
| parent | de3f161a49bf7486290f0e4b3531177f949bc3cd (diff) | |
| download | SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.tar.gz SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.tar.bz2 SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.zip | |
resync for merge conflicts
Diffstat (limited to 'TrainerMod/obj')
| -rw-r--r-- | TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | bin | 6915 -> 7012 bytes | |||
| -rw-r--r-- | TrainerMod/obj/Debug/TrainerMod.csproj.FileListAbsolute.txt | 8 | ||||
| -rw-r--r-- | TrainerMod/obj/Debug/TrainerMod.csprojResolveAssemblyReference.cache | bin | 75042 -> 79113 bytes | |||
| -rw-r--r-- | TrainerMod/obj/Debug/TrainerMod.dll | bin | 23552 -> 24064 bytes | |||
| -rw-r--r-- | TrainerMod/obj/Debug/TrainerMod.pdb | bin | 34304 -> 34304 bytes |
5 files changed, 8 insertions, 0 deletions
diff --git a/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex f782b8f7..7b09d9e8 100644 --- a/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TrainerMod/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 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 Binary files differindex 13cf99fc..cc53004f 100644 --- a/TrainerMod/obj/Debug/TrainerMod.csprojResolveAssemblyReference.cache +++ b/TrainerMod/obj/Debug/TrainerMod.csprojResolveAssemblyReference.cache diff --git a/TrainerMod/obj/Debug/TrainerMod.dll b/TrainerMod/obj/Debug/TrainerMod.dll Binary files differindex bcf663ab..d39f4375 100644 --- a/TrainerMod/obj/Debug/TrainerMod.dll +++ b/TrainerMod/obj/Debug/TrainerMod.dll diff --git a/TrainerMod/obj/Debug/TrainerMod.pdb b/TrainerMod/obj/Debug/TrainerMod.pdb Binary files differindex 21f85abf..e20c53af 100644 --- a/TrainerMod/obj/Debug/TrainerMod.pdb +++ b/TrainerMod/obj/Debug/TrainerMod.pdb |