shiftos-c-.git/source/WindowsFormsApplication1/bin/Debug/NAudio.xml, 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
HOLY **** THATS A LOT OFF ADDIITIONS
2016-07-24T21:56:02Z
Carver Harrison
pcarverb@hotmail.com
2016-07-24T21:56:02Z
urn:sha1:321ddfc66a0a366efa64506c0c33316ca57f251d