<feed xmlns='http://www.w3.org/2005/Atom'>
<title>extra/histacom2.git/TimeHACK.Main/obj/Debug/TimeHACK.WinClassicNotepad.resources, branch master</title>
<subtitle>Revival of the original hacking simulator! (WIP)
</subtitle>
<id>https://git.shiftos.dev/extra/histacom2.git/atom?h=master</id>
<link rel='self' href='https://git.shiftos.dev/extra/histacom2.git/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/extra/histacom2.git/'/>
<updated>2017-03-31T20:19:58Z</updated>
<entry>
<title>Merge remote-tracking branch 'origin/master'</title>
<updated>2017-03-31T20:19:58Z</updated>
<author>
<name>AShifter</name>
<email>loganr.lowe@gmail.com</email>
</author>
<published>2017-03-31T20:19:58Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/extra/histacom2.git/commit/?id=1e25868f0fb574d2b0f7e990b962a2d7b5efa9dd'/>
<id>urn:sha1:1e25868f0fb574d2b0f7e990b962a2d7b5efa9dd</id>
<content type='text'>
# 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
</content>
</entry>
<entry>
<title>HUGE OVERHAUL</title>
<updated>2017-03-17T23:31:41Z</updated>
<author>
<name>AShifter</name>
<email>loganr.lowe@gmail.com</email>
</author>
<published>2017-03-17T23:31:41Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/extra/histacom2.git/commit/?id=0c00b5f33c37427228c53794732d513adc862261'/>
<id>urn:sha1:0c00b5f33c37427228c53794732d513adc862261</id>
<content type='text'>
Added TimeHACK.Engine - Starting a new engine system to render Operating
System borders

Made more changes ( ͡° ͜ʖ ͡°)
</content>
</entry>
</feed>
