<feed xmlns='http://www.w3.org/2005/Atom'>
<title>shiftos-c-.git, 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-27T21:13:54Z</updated>
<entry>
<title>Update Credits.txt</title>
<updated>2016-07-27T21:13:54Z</updated>
<author>
<name>Carver Harrison</name>
<email>pcarverb@hotmail.com</email>
</author>
<published>2016-07-27T21:13:54Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=d4e5a700345b78491d0e204364f23dc5df48ae73'/>
<id>urn:sha1:d4e5a700345b78491d0e204364f23dc5df48ae73</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update Credits.txt</title>
<updated>2016-07-27T20:57:54Z</updated>
<author>
<name>Carver Harrison</name>
<email>pcarverb@hotmail.com</email>
</author>
<published>2016-07-27T20:57:54Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=0fb53cb30baa3ee9d23283abdae40e628c931ea3'/>
<id>urn:sha1:0fb53cb30baa3ee9d23283abdae40e628c931ea3</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update Not Found</title>
<updated>2016-07-25T19:38:46Z</updated>
<author>
<name>william341</name>
<email>wwokwilliam@gmail.com</email>
</author>
<published>2016-07-25T19:38:46Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=2c237faa2047856c950f01e28eec67a3e19ad6fb'/>
<id>urn:sha1:2c237faa2047856c950f01e28eec67a3e19ad6fb</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' of https://github.com/MichaelTheShifter/ShiftOS-C-</title>
<updated>2016-07-25T19:26:20Z</updated>
<author>
<name>william341</name>
<email>wwokwilliam@gmail.com</email>
</author>
<published>2016-07-25T19:26:20Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=390482cd88fb08f4bc87a1268e5fb8114207c05d'/>
<id>urn:sha1:390482cd88fb08f4bc87a1268e5fb8114207c05d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Create .gitignore</title>
<updated>2016-07-25T19:25:56Z</updated>
<author>
<name>william341</name>
<email>wwokwilliam@gmail.com</email>
</author>
<published>2016-07-25T19:25:56Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=df4bcb786561837b05c587ae302d65995a0c9557'/>
<id>urn:sha1:df4bcb786561837b05c587ae302d65995a0c9557</id>
<content type='text'>
</content>
</entry>
<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>Merge pull request #17 from MichaelTheShifter/shiftui_integration</title>
<updated>2016-07-25T16:57:52Z</updated>
<author>
<name>Michael VanOverbeek</name>
<email>michaelshiftos@gmail.com</email>
</author>
<published>2016-07-25T16:57:52Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=46c1c31302f111a1f3ec23a70e6f3986a9aa2a27'/>
<id>urn:sha1:46c1c31302f111a1f3ec23a70e6f3986a9aa2a27</id>
<content type='text'>
Shiftui integration</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'refs/remotes/origin/master' into shiftui_integration</title>
<updated>2016-07-25T16:54:08Z</updated>
<author>
<name>Michael VanOverbeek</name>
<email>michaelshiftos@gmail.com</email>
</author>
<published>2016-07-25T16:54:08Z</published>
<link rel='alternate' type='text/html' href='https://git.shiftos.dev/shiftos-c-.git/commit/?id=6fa16209519896de09949a27425dff00ebf2970a'/>
<id>urn:sha1:6fa16209519896de09949a27425dff00ebf2970a</id>
<content type='text'>
</content>
</entry>
</feed>
