diff options
| author | kali <kali@leap.se> | 2014-08-13 14:16:09 -0500 |
|---|---|---|
| committer | kali <kali@leap.se> | 2014-08-13 14:16:09 -0500 |
| commit | 481b5e51b88bd5e0c2d856fbc0593d81634442da (patch) | |
| tree | 7c8e1bdc72916535ab5fd14697d8dc05e696b4bc /src/leap/bitmask/gui/ui/loggerwindow.ui | |
| parent | ab28bd5056e5d3e1c5a6b14307e67cea618e3359 (diff) | |
| parent | 8eff8582f39c5f3872f75ebd2c530a17d366310d (diff) | |
Merge branch 'develop' into deb-0.6.1-rc
Diffstat (limited to 'src/leap/bitmask/gui/ui/loggerwindow.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/loggerwindow.ui | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui index b19ed91a..fd8644c9 100644 --- a/src/leap/bitmask/gui/ui/loggerwindow.ui +++ b/src/leap/bitmask/gui/ui/loggerwindow.ui @@ -14,7 +14,7 @@ <string>Logs</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"> @@ -180,7 +180,7 @@ </tabstops> <resources> <include location="../../../../../data/resources/loggerwindow.qrc"/> - <include location="../../../../../data/resources/mainwindow.qrc"/> + <include location="../../../../../data/resources/icons.qrc"/> </resources> <connections/> </ui> |