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/WindowsFormsApplication1/bin/Debug/ShiftOS.vshost.exe.manifest | |
| 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/WindowsFormsApplication1/bin/Debug/ShiftOS.vshost.exe.manifest')
| -rw-r--r-- | source/WindowsFormsApplication1/bin/Debug/ShiftOS.vshost.exe.manifest | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.vshost.exe.manifest b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.vshost.exe.manifest deleted file mode 100644 index 061c9ca..0000000 --- a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> - <security> - <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3"> - <requestedExecutionLevel level="asInvoker" uiAccess="false"/> - </requestedPrivileges> - </security> - </trustInfo> -</assembly> |