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
..
Properties	export trainer to separate mod; ships with modapi in release folder	2016-03-01 16:16:51 -05:00
bin/Debug	updates to change working location	2016-03-03 14:01:32 -05:00
obj/Debug	Merge remote-tracking branch 'origin/master'	2016-03-03 14:04:29 -05:00
TrainerMod.cs	Resolved static analysis issues	2016-03-03 18:50:22 +00:00
TrainerMod.csproj	updates to change working location	2016-03-03 14:01:32 -05:00