aboutsummaryrefslogtreecommitdiff
path: root/source/.vs
AgeCommit message (Collapse)Author
2016-07-25Merge remote-tracking branch 'origin/master'william341
# 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
2016-07-25Fix Cheats and some designer stuffMichael VanOverbeek
2016-07-25Something.Michael VanOverbeek
//I have no idea what this does. - Michael
2016-07-24fix borders biachwilliam341
2016-07-24Fixed 300 ErrorsCarver Harrison
2016-07-24HOLY **** THATS A LOT OFF ADDIITIONSCarver Harrison
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 11:42:55 +0000