Merge branch 'develop' into remove-updater

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

1 files changed, 0 insertions, 27 deletions

diff --git a/launcher/ui/dialogs/ImportResourcePackDialog.h b/launcher/ui/dialogs/ImportResourcePackDialog.h
deleted file mode 100644
index 8356f204..00000000
--- a/launcher/ui/dialogs/ImportResourcePackDialog.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <QDialog>
-#include <QItemSelection>
-
-#include "ui/instanceview/InstanceProxyModel.h"
-
-namespace Ui {
-class ImportResourcePackDialog;
-}
-
-class ImportResourcePackDialog : public QDialog {
-    Q_OBJECT
-
-   public:
-    explicit ImportResourcePackDialog(QWidget* parent = 0);
-    ~ImportResourcePackDialog();
-    InstanceProxyModel* proxyModel;
-    QString selectedInstanceKey;
-
-   private:
-    Ui::ImportResourcePackDialog* ui;
-
-   private slots:
-    void selectionChanged(QItemSelection, QItemSelection);
-    void activated(QModelIndex);
-};