aboutsummaryrefslogtreecommitdiff
path: root/source/ShiftUI Designer
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-25OooOOO easter eggwilliam341
2016-07-25#17 revert shifter UI to old UI.Michael VanOverbeek
Gonna add the new UI when I know more System.Reflection stuff.
2016-07-24fix borders biachwilliam341
2016-07-24HOLY **** THATS A LOT OFF ADDIITIONSCarver Harrison
2016-07-24Added Hashing API and Fixed BugsCarver Harrison
2016-07-23Terminal tweaks and no more beepingwilliam341
2016-07-23I dun derped.MichaelTheShifter