Zoryn de3f161a49 Merge remote-tracking branch 'origin/master' ... # Conflicts: # Release/StardewModdingAPI.exe # StardewModdingAPI/Program.cs # StardewModdingAPI/StardewModdingAPI.csproj # StardewModdingAPI/obj/x86/Debug/StardewModdingAPI.csproj.FileListAbsolute.txt # TrainerMod/bin/Debug/TrainerMod.dll # TrainerMod/obj/Debug/TrainerMod.dll		2016-03-03 14:04:29 -05:00
..
DesignTimeResolveAssemblyReferencesInput.cache	Merge remote-tracking branch 'origin/master'	2016-03-03 14:04:29 -05:00
TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs	export trainer to separate mod; ships with modapi in release folder	2016-03-01 16:16:51 -05:00
TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs	export trainer to separate mod; ships with modapi in release folder	2016-03-01 16:16:51 -05:00
TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs	export trainer to separate mod; ships with modapi in release folder	2016-03-01 16:16:51 -05:00
TrainerMod.csproj.FileListAbsolute.txt	updates to change working location	2016-03-03 14:01:32 -05:00
TrainerMod.csprojResolveAssemblyReference.cache	updates to change working location	2016-03-03 14:01:32 -05:00
TrainerMod.dll	updates to change working location	2016-03-03 14:01:32 -05:00
TrainerMod.pdb	updates to change working location	2016-03-03 14:01:32 -05:00