Merge branch 'master' of http://github.com/peterix/MultiMC5

Conflicts:
	CMakeLists.txt
	main.cpp

1 files changed, 6 insertions, 1 deletions

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index c2dedf74..5d990639 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -44,14 +44,19 @@ public:
 
     // Browser Dialog
     void openWebPage(QUrl url);
+
+private:
+	Instance *selectedInstance();
 	
 private slots:
 	void on_actionAbout_triggered();
 	
 	void on_actionAddInstance_triggered();
 	
-	void on_actionViewInstanceFolder_triggered();
+	void on_actionChangeInstGroup_triggered();
 	
+	void on_actionViewInstanceFolder_triggered();
+
 	void on_actionRefresh_triggered();
 	
 	void on_actionViewCentralModsFolder_triggered();