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

---
 ftnoir_tracker_ht/ht-tracker.qrc |   5 +++++
 ftnoir_tracker_ht/images/ht.ico  | Bin 15086 -> 0 bytes
 ftnoir_tracker_ht/images/ht.png  | Bin 0 -> 2010 bytes
 ftnoir_tracker_ht/tracker.qrc    |   5 -----
 4 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 ftnoir_tracker_ht/ht-tracker.qrc
 delete mode 100644 ftnoir_tracker_ht/images/ht.ico
 create mode 100644 ftnoir_tracker_ht/images/ht.png
 delete mode 100644 ftnoir_tracker_ht/tracker.qrc

(limited to 'ftnoir_tracker_ht')

diff --git a/ftnoir_tracker_ht/ht-tracker.qrc b/ftnoir_tracker_ht/ht-tracker.qrc
new file mode 100644
index 00000000..b6af7a18
--- /dev/null
+++ b/ftnoir_tracker_ht/ht-tracker.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/ht.png</file>
+    </qresource>
+</RCC>
diff --git a/ftnoir_tracker_ht/images/ht.ico b/ftnoir_tracker_ht/images/ht.ico
deleted file mode 100644
index 7555ce25..00000000
Binary files a/ftnoir_tracker_ht/images/ht.ico and /dev/null differ
diff --git a/ftnoir_tracker_ht/images/ht.png b/ftnoir_tracker_ht/images/ht.png
new file mode 100644
index 00000000..19c73d21
Binary files /dev/null and b/ftnoir_tracker_ht/images/ht.png differ
diff --git a/ftnoir_tracker_ht/tracker.qrc b/ftnoir_tracker_ht/tracker.qrc
deleted file mode 100644
index 9627f700..00000000
--- a/ftnoir_tracker_ht/tracker.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/HT.ico</file>
-    </qresource>
-</RCC>
-- 
cgit v1.2.3