Merge branch 'feature_groupview' into integration_derpstances_groupview

This commit is contained in:
Petr Mrázek
2014-02-08 22:18:32 +01:00
24 changed files with 1542 additions and 3099 deletions

View File

@ -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"