diff options
| author | william341 <[email protected]> | 2016-07-25 12:23:44 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2016-07-25 12:23:44 -0700 |
| commit | 6b83f071c4208ae4104f5659a848af08d7a75705 (patch) | |
| tree | 180d34fa07f753d89925fb67245329b05f4915c5 /source/ShiftUI | |
| parent | 5e4ac239005aeba9d190a3c6d428917dd94de607 (diff) | |
| parent | abe52183e0e34051196d72ac0e56733bd0749bdd (diff) | |
| download | shiftos-c--6b83f071c4208ae4104f5659a848af08d7a75705.tar.gz shiftos-c--6b83f071c4208ae4104f5659a848af08d7a75705.tar.bz2 shiftos-c--6b83f071c4208ae4104f5659a848af08d7a75705.zip | |
Merge remote-tracking branch 'origin/master'
# 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
Diffstat (limited to 'source/ShiftUI')
| -rw-r--r-- | source/ShiftUI/bin/Debug/Microsoft.Build.Framework.dll | bin | 101608 -> 0 bytes | |||
| -rw-r--r-- | source/ShiftUI/bin/Debug/Microsoft.Build.Utilities.v12.0.dll | bin | 298752 -> 0 bytes | |||
| -rw-r--r-- | source/ShiftUI/bin/Debug/Mono.Cairo.dll | bin | 59904 -> 0 bytes | |||
| -rw-r--r-- | source/ShiftUI/bin/Debug/Mono.Posix.dll | bin | 181248 -> 0 bytes | |||
| -rw-r--r-- | source/ShiftUI/bin/Debug/ShiftUI.dll | bin | 2656768 -> 0 bytes | |||
| -rw-r--r-- | source/ShiftUI/bin/Debug/ShiftUI.pdb | bin | 6602240 -> 0 bytes | |||
| -rw-r--r-- | source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt | 8 | ||||
| -rw-r--r-- | source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache | bin | 1347 -> 1347 bytes | |||
| -rw-r--r-- | source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache | bin | 48632 -> 62307 bytes | |||
| -rw-r--r-- | source/ShiftUI/obj/Debug/ShiftUI.dll | bin | 2656768 -> 2656768 bytes | |||
| -rw-r--r-- | source/ShiftUI/obj/Debug/ShiftUI.pdb | bin | 6602240 -> 6589952 bytes |
11 files changed, 8 insertions, 0 deletions
diff --git a/source/ShiftUI/bin/Debug/Microsoft.Build.Framework.dll b/source/ShiftUI/bin/Debug/Microsoft.Build.Framework.dll Binary files differdeleted file mode 100644 index 81742ef..0000000 --- a/source/ShiftUI/bin/Debug/Microsoft.Build.Framework.dll +++ /dev/null diff --git a/source/ShiftUI/bin/Debug/Microsoft.Build.Utilities.v12.0.dll b/source/ShiftUI/bin/Debug/Microsoft.Build.Utilities.v12.0.dll Binary files differdeleted file mode 100644 index 8cdba1d..0000000 --- a/source/ShiftUI/bin/Debug/Microsoft.Build.Utilities.v12.0.dll +++ /dev/null diff --git a/source/ShiftUI/bin/Debug/Mono.Cairo.dll b/source/ShiftUI/bin/Debug/Mono.Cairo.dll Binary files differdeleted file mode 100644 index 924785a..0000000 --- a/source/ShiftUI/bin/Debug/Mono.Cairo.dll +++ /dev/null diff --git a/source/ShiftUI/bin/Debug/Mono.Posix.dll b/source/ShiftUI/bin/Debug/Mono.Posix.dll Binary files differdeleted file mode 100644 index 83fff46..0000000 --- a/source/ShiftUI/bin/Debug/Mono.Posix.dll +++ /dev/null diff --git a/source/ShiftUI/bin/Debug/ShiftUI.dll b/source/ShiftUI/bin/Debug/ShiftUI.dll Binary files differdeleted file mode 100644 index 4ea1e27..0000000 --- a/source/ShiftUI/bin/Debug/ShiftUI.dll +++ /dev/null diff --git a/source/ShiftUI/bin/Debug/ShiftUI.pdb b/source/ShiftUI/bin/Debug/ShiftUI.pdb Binary files differdeleted file mode 100644 index 7c1d4af..0000000 --- a/source/ShiftUI/bin/Debug/ShiftUI.pdb +++ /dev/null diff --git a/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt b/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt index 5430307..855938c 100644 --- a/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt +++ b/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt @@ -20,3 +20,11 @@ C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.Prop C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.csproj.GenerateResource.Cache C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.dll C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.pdb +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\bin\Debug\ShiftUI.dll +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\bin\Debug\ShiftUI.pdb +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\bin\Debug\Microsoft.Build.Framework.dll +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.csprojResolveAssemblyReference.cache +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.Properties.Resources.resources +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.csproj.GenerateResource.Cache +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.dll +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.pdb diff --git a/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache b/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache Binary files differindex 53ca4d5..4cf2b20 100644 --- a/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache +++ b/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache diff --git a/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache b/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache Binary files differindex 6639ac0..2b7273a 100644 --- a/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache +++ b/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache diff --git a/source/ShiftUI/obj/Debug/ShiftUI.dll b/source/ShiftUI/obj/Debug/ShiftUI.dll Binary files differindex 4ea1e27..b409099 100644 --- a/source/ShiftUI/obj/Debug/ShiftUI.dll +++ b/source/ShiftUI/obj/Debug/ShiftUI.dll diff --git a/source/ShiftUI/obj/Debug/ShiftUI.pdb b/source/ShiftUI/obj/Debug/ShiftUI.pdb Binary files differindex 7c1d4af..45ca52e 100644 --- a/source/ShiftUI/obj/Debug/ShiftUI.pdb +++ b/source/ShiftUI/obj/Debug/ShiftUI.pdb |