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 /StardewInjector/obj/Debug | |
| parent | de3f161a49bf7486290f0e4b3531177f949bc3cd (diff) | |
| download | SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.tar.gz SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.tar.bz2 SMAPI-9a1b910ea32f518b605c88315f192afc6fc40f28.zip | |
resync for merge conflicts
Diffstat (limited to 'StardewInjector/obj/Debug')
| -rw-r--r-- | StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | bin | 0 -> 7163 bytes | |||
| -rw-r--r-- | StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt | 22 | ||||
| -rw-r--r-- | StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache | bin | 0 -> 60415 bytes | |||
| -rw-r--r-- | StardewInjector/obj/Debug/StardewInjector.dll | bin | 0 -> 18432 bytes | |||
| -rw-r--r-- | StardewInjector/obj/Debug/StardewInjector.pdb | bin | 0 -> 42496 bytes | |||
| -rw-r--r-- | StardewInjector/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 | ||||
| -rw-r--r-- | StardewInjector/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 | ||||
| -rw-r--r-- | StardewInjector/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 |
8 files changed, 22 insertions, 0 deletions
diff --git a/StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differnew file mode 100644 index 00000000..836ea946 --- /dev/null +++ b/StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt b/StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..95f28c1a --- /dev/null +++ b/StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt @@ -0,0 +1,22 @@ +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\obj\Debug\StardewInjector.csprojResolveAssemblyReference.cache +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\steam_appid.txt +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewInjector.dll.config +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewInjector.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewInjector.pdb +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Game.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Mono.Cecil.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewModdingAPI.exe +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Stardew Valley.exe +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Graphics.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\xTile.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Lidgren.Network.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Xact.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Steamworks.NET.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewModdingAPI.pdb +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Game.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Graphics.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Xact.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\obj\Debug\StardewInjector.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\obj\Debug\StardewInjector.pdb diff --git a/StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache b/StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache Binary files differnew file mode 100644 index 00000000..e17ed343 --- /dev/null +++ b/StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache diff --git a/StardewInjector/obj/Debug/StardewInjector.dll b/StardewInjector/obj/Debug/StardewInjector.dll Binary files differnew file mode 100644 index 00000000..ec198674 --- /dev/null +++ b/StardewInjector/obj/Debug/StardewInjector.dll diff --git a/StardewInjector/obj/Debug/StardewInjector.pdb b/StardewInjector/obj/Debug/StardewInjector.pdb Binary files differnew file mode 100644 index 00000000..ea65643b --- /dev/null +++ b/StardewInjector/obj/Debug/StardewInjector.pdb diff --git a/StardewInjector/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/StardewInjector/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/StardewInjector/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs diff --git a/StardewInjector/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/StardewInjector/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/StardewInjector/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs diff --git a/StardewInjector/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/StardewInjector/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/StardewInjector/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs |