diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-08-11 20:08:10 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-08-11 20:08:10 -0300 |
| commit | ad2d4b132805270a13a6c80d6e6f154d687315b3 (patch) | |
| tree | e2fe502e35c7a0a45726972385ee78114e50238f /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | c52ca1aa1e9637d3e7d18f30b7c476ab1b1fe13a (diff) | |
| parent | 4e3de46b0398f363c65a74197ebd858f6d577b81 (diff) | |
Merge remote-tracking branch 'refs/remotes/elijah/feature/iconcleanup' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index 5bd21484..5dc48f29 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -32,7 +32,7 @@ <string>Bitmask</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> <property name="inputMethodHints"> @@ -399,7 +399,7 @@ </action> </widget> <resources> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> <include location="../../../../../data/resources/locale.qrc"/> </resources> <connections/> |