From 8303597a865400a363ae574ccde819302495f498 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 2 Apr 2013 18:41:01 +0200
Subject: Just put everything new in. Conflict resolution will be later

---
 ftnoir_protocol_ftn/ftnoir_ftncontrols.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ftnoir_protocol_ftn/ftnoir_ftncontrols.ui')

diff --git a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui
index 56983fbe..d8efec61 100644
--- a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui
+++ b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>images/FaceTrackNoIR.ico</normaloff>images/FaceTrackNoIR.ico</iconset>
+    <normaloff>images/FaceTrackNoIR.png</normaloff>images/facetracknoir.png</iconset>
   </property>
   <property name="layoutDirection">
    <enum>Qt::LeftToRight</enum>
-- 
cgit v1.2.3