diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
| commit | e241c3625c2e0f005ee2cb01577ceeb054bbbd98 (patch) | |
| tree | b874caae329a536ca15b331be386cf481307d28f /gui/MainWindow.ui | |
| parent | 421a46e3d3036ea0dea4889125ee58309d0ed21e (diff) | |
| parent | d2b2d55aa9a4031d1e179534796cbe07bc57080f (diff) | |
| download | MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.gz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.lz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.xz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.zip | |
Merge branch 'feature_theme_support' into develop
Conflicts:
main.cpp
Diffstat (limited to 'gui/MainWindow.ui')
| -rw-r--r-- | gui/MainWindow.ui | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index c79dc948..7adc5d37 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -500,6 +500,8 @@ </widget> <layoutdefault spacing="6" margin="11"/> <resources> + <include location="../resources/pe_dark/pe_dark.qrc"/> + <include location="../resources/pe_light/pe_light.qrc"/> <include location="../resources/multimc/multimc.qrc"/> <include location="../resources/instances/instances.qrc"/> </resources> |