diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-08-15 10:32:37 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-08-15 10:32:37 -0300 |
| commit | e8c028f3eb6cd0681f039c456dc1ac45c98d598f (patch) | |
| tree | b7e84ebafad106726308d3c87f58ad1d900d66d7 /src/leap/bitmask/gui/ui/preferences.ui | |
| parent | 159dbe295148975bdfe9a50f871254aa9adf2328 (diff) | |
| parent | fb9bad95cc4bd2769af5f91c2f0cac1be4c3c617 (diff) | |
Merge branch 'release-0.6.1'0.6.1
Diffstat (limited to 'src/leap/bitmask/gui/ui/preferences.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/preferences.ui | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui index e187c016..cd4d3a77 100644 --- a/src/leap/bitmask/gui/ui/preferences.ui +++ b/src/leap/bitmask/gui/ui/preferences.ui @@ -14,7 +14,7 @@ <string>Preferences</string> </property> <property name="windowIcon"> - <iconset resource="../../../../../data/resources/mainwindow.qrc"> + <iconset resource="../../../../../data/resources/icons.qrc"> <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset> </property> <layout class="QGridLayout" name="gridLayout_3"> @@ -174,7 +174,7 @@ </layout> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> |