From cf80e5b7471cfd5506319aa32e697c9688b1b4be Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 2 Apr 2013 18:31:34 +0200
Subject: merge continues

---
 facetracknoir/facetracknoir.ico            | Bin 23558 -> 0 bytes
 facetracknoir/facetracknoir.qrc            |  14 --------------
 facetracknoir/images/facetracknoir.ico     | Bin 23558 -> 0 bytes
 facetracknoir/images/facetracknoir.png     | Bin 0 -> 691 bytes
 facetracknoir/main-facetracknoir.qrc       |  14 ++++++++++++++
 facetracknoir/uielements/facetracknoir.ico | Bin 23558 -> 0 bytes
 6 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 facetracknoir/facetracknoir.ico
 delete mode 100644 facetracknoir/facetracknoir.qrc
 delete mode 100644 facetracknoir/images/facetracknoir.ico
 create mode 100644 facetracknoir/images/facetracknoir.png
 create mode 100644 facetracknoir/main-facetracknoir.qrc
 delete mode 100644 facetracknoir/uielements/facetracknoir.ico

(limited to 'facetracknoir')

diff --git a/facetracknoir/facetracknoir.ico b/facetracknoir/facetracknoir.ico
deleted file mode 100644
index 5115066c..00000000
Binary files a/facetracknoir/facetracknoir.ico and /dev/null differ
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
deleted file mode 100644
index 5115066c..00000000
Binary files a/facetracknoir/images/facetracknoir.ico and /dev/null differ
diff --git a/facetracknoir/images/facetracknoir.png b/facetracknoir/images/facetracknoir.png
new file mode 100644
index 00000000..b57724e0
Binary files /dev/null and b/facetracknoir/images/facetracknoir.png differ
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
deleted file mode 100644
index af36ec30..00000000
Binary files a/facetracknoir/uielements/facetracknoir.ico and /dev/null differ
-- 
cgit v1.2.3