diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-02 18:31:34 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-02 18:31:34 +0200 |
commit | cf80e5b7471cfd5506319aa32e697c9688b1b4be (patch) | |
tree | 8bc703091652d2d53f07a6eb7b9a29d319071957 /facetracknoir | |
parent | 4f05cb2af239ca8471b77c9f1d1c32e8c4cd3abc (diff) |
merge continues
Diffstat (limited to 'facetracknoir')
-rw-r--r-- | facetracknoir/facetracknoir.ico | bin | 23558 -> 0 bytes | |||
-rw-r--r-- | facetracknoir/facetracknoir.qrc | 14 | ||||
-rw-r--r-- | facetracknoir/images/facetracknoir.ico | bin | 23558 -> 0 bytes | |||
-rw-r--r-- | facetracknoir/images/facetracknoir.png | bin | 0 -> 691 bytes | |||
-rw-r--r-- | facetracknoir/main-facetracknoir.qrc | 14 | ||||
-rw-r--r-- | facetracknoir/uielements/facetracknoir.ico | bin | 23558 -> 0 bytes |
6 files changed, 14 insertions, 14 deletions
diff --git a/facetracknoir/facetracknoir.ico b/facetracknoir/facetracknoir.ico Binary files differdeleted file mode 100644 index 5115066c..00000000 --- a/facetracknoir/facetracknoir.ico +++ /dev/null diff --git a/facetracknoir/facetracknoir.qrc b/facetracknoir/facetracknoir.qrc deleted file mode 100644 index 60e4da7b..00000000 --- a/facetracknoir/facetracknoir.qrc +++ /dev/null @@ -1,14 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>UIElements/Tools.png</file> - <file>images/Settings16.png</file> - <file>images/SettingsOpen16.png</file> - <file>UIElements/Donate.png</file> - <file>UIElements/Curves.png</file> - <file>images/rotation_DOFs.png</file> - <file>images/translation_DOFs.png</file> - <file>images/330px-6DOF_en.png</file> - <file>images/FaceTrackNoIR.ico</file> - <file>UIElements/aboutFaceTrackNoIR.png</file> - </qresource> -</RCC> diff --git a/facetracknoir/images/facetracknoir.ico b/facetracknoir/images/facetracknoir.ico Binary files differdeleted file mode 100644 index 5115066c..00000000 --- a/facetracknoir/images/facetracknoir.ico +++ /dev/null diff --git a/facetracknoir/images/facetracknoir.png b/facetracknoir/images/facetracknoir.png Binary files differnew file mode 100644 index 00000000..b57724e0 --- /dev/null +++ b/facetracknoir/images/facetracknoir.png diff --git a/facetracknoir/main-facetracknoir.qrc b/facetracknoir/main-facetracknoir.qrc new file mode 100644 index 00000000..27b7dd30 --- /dev/null +++ b/facetracknoir/main-facetracknoir.qrc @@ -0,0 +1,14 @@ +<RCC> + <qresource prefix="/"> + <file>uielements/tools.png</file> + <file>images/settings16.png</file> + <file>images/settingsopen16.png</file> + <file>uielements/donate.png</file> + <file>uielements/curves.png</file> + <file>images/rotation_dofs.png</file> + <file>images/translation_dofs.png</file> + <file>images/330px-6dof_en.png</file> + <file>images/facetracknoir.png</file> + <file>uielements/aboutfacetracknoir.png</file> + </qresource> +</RCC> diff --git a/facetracknoir/uielements/facetracknoir.ico b/facetracknoir/uielements/facetracknoir.ico Binary files differdeleted file mode 100644 index af36ec30..00000000 --- a/facetracknoir/uielements/facetracknoir.ico +++ /dev/null |