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_filter_ewma2/ewma-filter.qrc | 5 +++++
 ftnoir_filter_ewma2/filter.qrc      | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 ftnoir_filter_ewma2/ewma-filter.qrc
 delete mode 100644 ftnoir_filter_ewma2/filter.qrc

(limited to 'ftnoir_filter_ewma2')

diff --git a/ftnoir_filter_ewma2/ewma-filter.qrc b/ftnoir_filter_ewma2/ewma-filter.qrc
new file mode 100644
index 00000000..e64ec35a
--- /dev/null
+++ b/ftnoir_filter_ewma2/ewma-filter.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/filter-16.png</file>
+    </qresource>
+</RCC>
diff --git a/ftnoir_filter_ewma2/filter.qrc b/ftnoir_filter_ewma2/filter.qrc
deleted file mode 100644
index e64ec35a..00000000
--- a/ftnoir_filter_ewma2/filter.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/filter-16.png</file>
-    </qresource>
-</RCC>
-- 
cgit v1.2.3