diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-08 22:18:32 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-08 22:18:32 +0100 |
| commit | af33b966848687048f0a9e409444bc1b1f7d12df (patch) | |
| tree | c978a58fddbcf1e6566f309f67579264ffdd4168 /gui/dialogs | |
| parent | 53069205faf4063e838bab4beea5089d6ec2a0af (diff) | |
| parent | aa41b891f06a629099d108ab1f4df94d1bbc828c (diff) | |
| download | MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar.gz MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar.lz MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.tar.xz MultiMC-af33b966848687048f0a9e409444bc1b1f7d12df.zip | |
Merge branch 'feature_groupview' into integration_derpstances_groupview
Diffstat (limited to 'gui/dialogs')
| -rw-r--r-- | gui/dialogs/IconPickerDialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/dialogs/IconPickerDialog.cpp b/gui/dialogs/IconPickerDialog.cpp index f7970b37..9b1c26ff 100644 --- a/gui/dialogs/IconPickerDialog.cpp +++ b/gui/dialogs/IconPickerDialog.cpp @@ -23,7 +23,7 @@ #include "ui_IconPickerDialog.h" #include "gui/Platform.h" -#include "gui/widgets/InstanceDelegate.h" +#include "gui/groupview/InstanceDelegate.h" #include "logic/icons/IconList.h" |