summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-12 18:17:08 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-12 18:17:08 -0300
commit9c7a740679122b42efbc2f02ea0235c690b1ab8f (patch)
treec03b90b7567aa843b99d01325c5948ce3947e433 /src
parent0bc57968a5b0f9f92aace387e1ebcd8e6e4362cc (diff)
parent37cd615c64d32603007fb3dfa3f736e8ff4df911 (diff)
Merge remote-tracking branch 'ivan/bug/remove-old-resources-path' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/gui/ui/statuspanel.ui1
-rw-r--r--src/leap/bitmask/gui/ui/wizard.ui1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/ui/statuspanel.ui b/src/leap/bitmask/gui/ui/statuspanel.ui
index baf05421..39992e1a 100644
--- a/src/leap/bitmask/gui/ui/statuspanel.ui
+++ b/src/leap/bitmask/gui/ui/statuspanel.ui
@@ -284,7 +284,6 @@
</widget>
<resources>
<include location="../../../../../data/resources/icons.qrc"/>
- <include location="../../../../data/resources/icons.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index d52b8a7c..009d92ee 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -841,7 +841,6 @@
<resources>
<include location="../../../../../data/resources/mainwindow.qrc"/>
<include location="../../../../../data/resources/locale.qrc"/>
- <include location="../../../../data/resources/mainwindow.qrc"/>
</resources>
<connections/>
</ui>