diff options
Diffstat (limited to 'source/WindowsFormsApplication1/obj/Debug')
18 files changed, 4 insertions, 0 deletions
diff --git a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 3d1f8cc..84df0a9 100644 --- a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll b/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll Binary files differindex 9fcb4ef..03d8d5a 100644 --- a/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll +++ b/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.FinalMission.ChooseYourApproach.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.FinalMission.ChooseYourApproach.resources Binary files differindex 4003dd1..6a254bc 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.FinalMission.ChooseYourApproach.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.FinalMission.ChooseYourApproach.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources Binary files differindex 558466f..c792b50 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources Binary files differindex 1508d1b..771bcb2 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources Binary files differindex a027528..7ea1939 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources Binary files differindex 1682936..4e17fe9 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources Binary files differindex 5c81027..554b503 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.resources Binary files differindex 6f6cbf1..d421763 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources Binary files differindex eee1810..401322e 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Shifter.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Shifter.resources Binary files differindex 12c8ba1..73359a1 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Shifter.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Shifter.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt index 79ff222..97a3d5e 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt @@ -235,4 +235,8 @@ C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Sv C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Svg.xml C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Interop.WMPLib.dll C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\AxInterop.WMPLib.dll +<<<<<<< HEAD +C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\WindowsFormsApplication1\obj\Debug\ShiftOS.Apps.About.resources +======= C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\obj\Debug\ShiftOS.Apps.About.resources +>>>>>>> origin/master diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache Binary files differindex e011828..f19cddf 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.ResolveComReference.cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.ResolveComReference.cache Binary files differindex a67209d..2773d20 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.ResolveComReference.cache +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.ResolveComReference.cache diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache Binary files differindex 9eacdff..985a221 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe Binary files differindex 3993494..b166183 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb Binary files differindex 2dfd58f..1e80a5e 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb diff --git a/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources b/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources Binary files differindex d545f9f..2f7d78b 100644 --- a/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources +++ b/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources |