shiftos-c-.git/source/.vs/ShiftOS, branch master The Official C# Rewrite of ShiftOS. https://git.shiftos.dev/shiftos-c-.git/atom?h=master 2016-07-25T19:23:44Z Merge remote-tracking branch 'origin/master' 2016-07-25T19:23:44Z william341 wwokwilliam@gmail.com 2016-07-25T19:23:44Z urn:sha1:6b83f071c4208ae4104f5659a848af08d7a75705 # 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 Fix Cheats and some designer stuff 2016-07-25T18:30:01Z Michael VanOverbeek michaelshiftos@gmail.com 2016-07-25T18:30:01Z urn:sha1:abe52183e0e34051196d72ac0e56733bd0749bdd Something. 2016-07-25T16:15:21Z Michael VanOverbeek michaelshiftos@gmail.com 2016-07-25T16:15:21Z urn:sha1:401ae1bb353887a2b90a3dbf53b8913dc84d70a9 //I have no idea what this does. - Michael fix borders biach 2016-07-25T02:24:08Z william341 wwokwilliam@gmail.com 2016-07-25T02:24:08Z urn:sha1:245d95fb3d83a97f81f559dd4e77eeb3677aa513 Fixed 300 Errors 2016-07-24T23:43:03Z Carver Harrison pcarverb@hotmail.com 2016-07-24T23:43:03Z urn:sha1:9fe3a47a712f99ebdbd5f4bf720d49de1db7bbc2 HOLY **** THATS A LOT OFF ADDIITIONS 2016-07-24T21:56:02Z Carver Harrison pcarverb@hotmail.com 2016-07-24T21:56:02Z urn:sha1:321ddfc66a0a366efa64506c0c33316ca57f251d