<feed xmlns='http://www.w3.org/2005/Atom'>
<title>shiftos-c-.git/source/WindowsFormsApplication1/bin/Debug, branch master</title>
<subtitle>The Official C# Rewrite of ShiftOS.
</subtitle>
<id>https://git.shiftos.dev/shiftos-c-.git/atom?h=master</id>
<link rel='self' href='https://git.shiftos.dev/shiftos-c-.git/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/'/>
<updated>2016-07-25T19:23:44Z</updated>
<entry>
<title>Merge remote-tracking branch 'origin/master'</title>
<updated>2016-07-25T19:23:44Z</updated>
<author>
<name>william341</name>
<email>wwokwilliam@gmail.com</email>
</author>
<published>2016-07-25T19:23:44Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=6b83f071c4208ae4104f5659a848af08d7a75705'/>
<id>urn:sha1:6b83f071c4208ae4104f5659a848af08d7a75705</id>
<content type='text'>
# Conflicts:
#	source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe
#	source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb

#	source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

#	source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources

#	source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt

#	source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache

#	source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache
#	source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe
#	source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb
</content>
</entry>
<entry>
<title>OooOOO easter egg</title>
<updated>2016-07-25T19:18:40Z</updated>
<author>
<name>william341</name>
<email>wwokwilliam@gmail.com</email>
</author>
<published>2016-07-25T19:18:40Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=5e4ac239005aeba9d190a3c6d428917dd94de607'/>
<id>urn:sha1:5e4ac239005aeba9d190a3c6d428917dd94de607</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix Cheats and some designer stuff</title>
<updated>2016-07-25T18:30:01Z</updated>
<author>
<name>Michael VanOverbeek</name>
<email>michaelshiftos@gmail.com</email>
</author>
<published>2016-07-25T18:30:01Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=abe52183e0e34051196d72ac0e56733bd0749bdd'/>
<id>urn:sha1:abe52183e0e34051196d72ac0e56733bd0749bdd</id>
<content type='text'>
</content>
</entry>
<entry>
<title>#17 revert shifter UI to old UI.</title>
<updated>2016-07-25T13:04:47Z</updated>
<author>
<name>Michael VanOverbeek</name>
<email>michaelshiftos@gmail.com</email>
</author>
<published>2016-07-25T13:04:47Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=862625a084fceee064db0573cc7d25938fe1cb9b'/>
<id>urn:sha1:862625a084fceee064db0573cc7d25938fe1cb9b</id>
<content type='text'>
Gonna add the new UI when I know more System.Reflection stuff.
</content>
</entry>
<entry>
<title>fix borders biach</title>
<updated>2016-07-25T02:24:08Z</updated>
<author>
<name>william341</name>
<email>wwokwilliam@gmail.com</email>
</author>
<published>2016-07-25T02:24:08Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=245d95fb3d83a97f81f559dd4e77eeb3677aa513'/>
<id>urn:sha1:245d95fb3d83a97f81f559dd4e77eeb3677aa513</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fixed 300 Errors</title>
<updated>2016-07-24T23:43:03Z</updated>
<author>
<name>Carver Harrison</name>
<email>pcarverb@hotmail.com</email>
</author>
<published>2016-07-24T23:43:03Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=9fe3a47a712f99ebdbd5f4bf720d49de1db7bbc2'/>
<id>urn:sha1:9fe3a47a712f99ebdbd5f4bf720d49de1db7bbc2</id>
<content type='text'>
</content>
</entry>
<entry>
<title>HOLY **** THATS A LOT OFF ADDIITIONS</title>
<updated>2016-07-24T21:56:02Z</updated>
<author>
<name>Carver Harrison</name>
<email>pcarverb@hotmail.com</email>
</author>
<published>2016-07-24T21:56:02Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=321ddfc66a0a366efa64506c0c33316ca57f251d'/>
<id>urn:sha1:321ddfc66a0a366efa64506c0c33316ca57f251d</id>
<content type='text'>
</content>
</entry>
</feed>
