summaryrefslogtreecommitdiffstats
path: root/gui/mainwindow.ui
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-18 18:10:41 +0100
committerSky <git@bunnies.cc>2013-10-18 18:10:41 +0100
commitb2574542b1d456a46baa8e6c0d351157b9cb18b3 (patch)
treee004e0894ae40b9a63160ea237b4ef4ec9aceda3 /gui/mainwindow.ui
parent709252fe9ecec3cc388966d695844f2593029c4f (diff)
parentdcf58cdf12ae9370ba1bf9d6bb789649db82e520 (diff)
downloadMultiMC-b2574542b1d456a46baa8e6c0d351157b9cb18b3.tar
MultiMC-b2574542b1d456a46baa8e6c0d351157b9cb18b3.tar.gz
MultiMC-b2574542b1d456a46baa8e6c0d351157b9cb18b3.tar.lz
MultiMC-b2574542b1d456a46baa8e6c0d351157b9cb18b3.tar.xz
MultiMC-b2574542b1d456a46baa8e6c0d351157b9cb18b3.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'gui/mainwindow.ui')
-rw-r--r--gui/mainwindow.ui4
1 files changed, 4 insertions, 0 deletions
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index 4c288d5f..0f883d13 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -13,6 +13,10 @@
<property name="windowTitle">
<string>MultiMC 5</string>
</property>
+ <property name="windowIcon">
+ <iconset resource="../multimc.qrc">
+ <normaloff>:/icons/multimc/scalable/apps/multimc.svg</normaloff>:/icons/multimc/scalable/apps/multimc.svg</iconset>
+ </property>
<widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">