-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
So apparently the solution was to just copy paste everything together...
- Loading branch information
Utat Uav
committed
Jan 27, 2015
1 parent
3f1f5bd
commit 5f4fe47
Showing
170 changed files
with
16,779 additions
and
14,426 deletions.
There are no files selected for viewing
688 changes: 344 additions & 344 deletions
688
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile
Large diffs are not rendered by default.
Oops, something went wrong.
2,710 changes: 1,344 additions & 1,366 deletions
2,710
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Debug
Large diffs are not rendered by default.
Oops, something went wrong.
2,686 changes: 1,332 additions & 1,354 deletions
2,686
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/Makefile.Release
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file removed
BIN
-64.2 KB
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/clickablelabel.obj
Binary file not shown.
Binary file removed
BIN
-114 KB
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe
Binary file not shown.
30 changes: 15 additions & 15 deletions
30
...station-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe.embed.manifest
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
<?xml version='1.0' encoding='UTF-8' standalone='yes'?> | ||
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> | ||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> | ||
<security> | ||
<requestedPrivileges> | ||
<requestedExecutionLevel level='asInvoker' uiAccess='false' /> | ||
</requestedPrivileges> | ||
</security> | ||
</trustInfo> | ||
<dependency> | ||
<dependentAssembly> | ||
<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*' /> | ||
</dependentAssembly> | ||
</dependency> | ||
</assembly> | ||
<?xml version='1.0' encoding='UTF-8' standalone='yes'?> | ||
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'> | ||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> | ||
<security> | ||
<requestedPrivileges> | ||
<requestedExecutionLevel level='asInvoker' uiAccess='false' /> | ||
</requestedPrivileges> | ||
</security> | ||
</trustInfo> | ||
<dependency> | ||
<dependentAssembly> | ||
<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*' /> | ||
</dependentAssembly> | ||
</dependency> | ||
</assembly> |
2 changes: 1 addition & 1 deletion
2
...undstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe_manifest.rc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ "debug\\groundstation.exe.embed.manifest" | ||
1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ "debug\\groundstation.exe.embed.manifest" |
Binary file removed
BIN
-704 Bytes
...ndstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.exe_manifest.res
Binary file not shown.
Binary file removed
BIN
-1.42 MB
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.ilk
Binary file not shown.
Binary file modified
BIN
-720 KB
(62%)
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/groundstation.pdb
Binary file not shown.
Binary file modified
BIN
+4.58 KB
(110%)
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/main.obj
Binary file not shown.
Binary file modified
BIN
+55.7 KB
(180%)
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicdisplay.obj
Binary file not shown.
Binary file modified
BIN
+325 KB
(300%)
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainpicwidget.obj
Binary file not shown.
Binary file modified
BIN
-45.1 KB
(76%)
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/mainwindow.obj
Binary file not shown.
125 changes: 0 additions & 125 deletions
125
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_clickablelabel.cpp
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-58.8 KB
build-groundstation-Desktop_Qt_5_3_MSVC2010_OpenGL_32bit-Debug/debug/moc_clickablelabel.obj
Binary file not shown.
Oops, something went wrong.