ShiftOS-Rewind/ShiftOS.Main/ShiftOS
Alex-TIMEHACK 4037be53b2 Updated my fork!
Conflicts:
	ShiftOS.Engine/ShiftOS.Engine.csproj
	ShiftOS.Engine/Terminal/Commands/Hello.cs
	ShiftOS.Engine/Terminal/TerminalBackend.cs
	ShiftOS.Engine/Terminal/TerminalCommand.cs
	ShiftOS.Main/ShiftOS.Main.csproj
	ShiftOS.Main/ShiftOS/Apps/Terminal.cs
	ShiftOS.Main/ShiftOS/Desktop.cs
2017-11-18 16:29:54 +00:00
..
Apps Updated my fork! 2017-11-18 16:29:54 +00:00
Desktop.cs Updated my fork! 2017-11-18 16:29:54 +00:00
Desktop.Designer.cs Only 1/4 broken ShiftFS and WIP File Skimmer 2017-11-11 08:53:55 -05:00
Desktop.resx added desktop and some small additions and changes to shiftwm 2017-09-27 18:32:16 -04:00