Histacom2/TimeHACK.Engine
AShifter 1e25868f0f Merge remote-tracking branch 'origin/master'
# Conflicts:

#	TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
#	TimeHACK.Main/bin/Release/TimeHACK.application
#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache

#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache

#	TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
#	TimeHACK.Main/obj/Release/TimeHACK.application
2017-03-31 14:19:58 -06:00
..
bin Added Infobox 2017-03-31 14:17:32 -06:00
obj Merge remote-tracking branch 'origin/master' 2017-03-31 14:19:58 -06:00
Properties Added Infobox 2017-03-31 14:17:32 -06:00
Resources Added Infobox 2017-03-31 14:17:32 -06:00
Template Added Infobox 2017-03-31 14:17:32 -06:00
packages.config added downloader and installer 2017-03-27 01:56:21 +02:00
TimeHACK.Engine.csproj Added Infobox 2017-03-31 14:17:32 -06:00
WCMessageParser.cs make message parser 2017-03-31 14:28:34 -04:00
WindowManager.cs Added Infobox 2017-03-31 14:17:32 -06:00