diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:29:13 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 00:29:13 +0100 |
| commit | f7c97efcf3785f597417895945b24c2e7476cba8 (patch) | |
| tree | c0ad8ba4b59bf9be441c2037ae7592585c3cbe58 /gui/MainWindow.ui | |
| parent | e3d2e5fd7405baa8137e300e8cc817e70df172b7 (diff) | |
| parent | a354e8bfae812b23b85b65c4a5b7e860cb18080c (diff) | |
| download | MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.gz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.lz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.tar.xz MultiMC-f7c97efcf3785f597417895945b24c2e7476cba8.zip | |
Merge branch 'feature_profiling' into integration_json_and_tools
Diffstat (limited to 'gui/MainWindow.ui')
| -rw-r--r-- | gui/MainWindow.ui | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui index 8cf26d18..90c86075 100644 --- a/gui/MainWindow.ui +++ b/gui/MainWindow.ui @@ -531,9 +531,8 @@ </widget> <layoutdefault spacing="6" margin="11"/> <resources> - <include location="../resources/instances/instances.qrc"/> <include location="../resources/multimc/multimc.qrc"/> - <include location="../resources/backgrounds/backgrounds.qrc"/> + <include location="../resources/instances/instances.qrc"/> </resources> <connections/> </ui> |