summaryrefslogtreecommitdiffstats
path: root/gui/consolewindow.h
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-26 11:13:14 +0100
committerSky <git@bunnies.cc>2013-10-26 11:13:14 +0100
commit1f28a3b8af228ec40412571859f15ea216ccb52a (patch)
tree975225cfc5981d9f8e5b79ba224db02782aa4faf /gui/consolewindow.h
parentcf07b90bdaf7dda2cbdd8ae9a7212c04badd0b09 (diff)
parentc467ebf1327d6266fc51443edfac6f0b536b6602 (diff)
downloadMultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar.gz
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar.lz
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.tar.xz
MultiMC-1f28a3b8af228ec40412571859f15ea216ccb52a.zip
Merge branch 'develop'
Diffstat (limited to 'gui/consolewindow.h')
-rw-r--r--gui/consolewindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/consolewindow.h b/gui/consolewindow.h
index 6a6c9e50..e8790c92 100644
--- a/gui/consolewindow.h
+++ b/gui/consolewindow.h
@@ -49,7 +49,7 @@ public slots:
private slots:
void on_closeButton_clicked();
void on_btnKillMinecraft_clicked();
- void onEnded();
+ void onEnded(BaseInstance *instance);
protected:
void closeEvent(QCloseEvent *);