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_protocol_sc/images/fsx.ico  | Bin 87910 -> 0 bytes
 ftnoir_protocol_sc/images/fsx.png  | Bin 0 -> 813 bytes
 ftnoir_protocol_sc/images/fsx1.png | Bin 0 -> 1920 bytes
 ftnoir_protocol_sc/protocol.qrc    |   5 -----
 ftnoir_protocol_sc/sc-protocol.qrc |   5 +++++
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 ftnoir_protocol_sc/images/fsx.ico
 create mode 100644 ftnoir_protocol_sc/images/fsx.png
 create mode 100644 ftnoir_protocol_sc/images/fsx1.png
 delete mode 100644 ftnoir_protocol_sc/protocol.qrc
 create mode 100644 ftnoir_protocol_sc/sc-protocol.qrc

(limited to 'ftnoir_protocol_sc')

diff --git a/ftnoir_protocol_sc/images/fsx.ico b/ftnoir_protocol_sc/images/fsx.ico
deleted file mode 100644
index 1c71d409..00000000
Binary files a/ftnoir_protocol_sc/images/fsx.ico and /dev/null differ
diff --git a/ftnoir_protocol_sc/images/fsx.png b/ftnoir_protocol_sc/images/fsx.png
new file mode 100644
index 00000000..16b072a1
Binary files /dev/null and b/ftnoir_protocol_sc/images/fsx.png differ
diff --git a/ftnoir_protocol_sc/images/fsx1.png b/ftnoir_protocol_sc/images/fsx1.png
new file mode 100644
index 00000000..a1f0f188
Binary files /dev/null and b/ftnoir_protocol_sc/images/fsx1.png differ
diff --git a/ftnoir_protocol_sc/protocol.qrc b/ftnoir_protocol_sc/protocol.qrc
deleted file mode 100644
index de6018af..00000000
--- a/ftnoir_protocol_sc/protocol.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/FSX.ico</file>
-    </qresource>
-</RCC>
diff --git a/ftnoir_protocol_sc/sc-protocol.qrc b/ftnoir_protocol_sc/sc-protocol.qrc
new file mode 100644
index 00000000..127d5180
--- /dev/null
+++ b/ftnoir_protocol_sc/sc-protocol.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/fsx.png</file>
+    </qresource>
+</RCC>
-- 
cgit v1.2.3