diff options
| author | TakSuyu <taksuyu@gmail.com> | 2013-07-27 12:55:51 -0700 |
|---|---|---|
| committer | TakSuyu <taksuyu@gmail.com> | 2013-07-27 12:55:51 -0700 |
| commit | dc39d093396c9a0ed4f03d81f95fcc8fa5705b65 (patch) | |
| tree | b88bf5fa692de82ce3418bdf5c55e9cd9eff37bc /gui/mainwindow.h | |
| parent | 44498f98945b7501486da35c5fdc32f94a2be080 (diff) | |
| parent | a7a84d4dbb58565f108cb0886da6cb786e34d10d (diff) | |
| download | MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar.gz MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar.lz MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.tar.xz MultiMC-dc39d093396c9a0ed4f03d81f95fcc8fa5705b65.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
gui/mainwindow.cpp
Diffstat (limited to 'gui/mainwindow.h')
| -rw-r--r-- | gui/mainwindow.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gui/mainwindow.h b/gui/mainwindow.h index f13d9395..a10d570c 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -108,8 +108,12 @@ private slots: void on_actionChangeInstLWJGLVersion_triggered(); + void on_actionInstanceSettings_triggered(); + public slots: void instanceActivated ( QModelIndex ); + + void instanceChanged ( QModelIndex ); void startTask(Task *task); |