diff options
| author | Björn Hagemeister | 2014-06-02 15:27:23 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-06-02 15:27:23 +0200 |
| commit | 4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62 (patch) | |
| tree | c798ea39460f49f6f6e34f7f909470923bf68e5f /src/server/mainwindow/mainwindow.h | |
| parent | Put Check if manager is running on machine into method. (diff) | |
| parent | Uncheck lock if any action is performed. (diff) | |
| download | pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.tar.gz pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.tar.xz pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
src/server/mainwindow/mainwindow.h
Diffstat (limited to 'src/server/mainwindow/mainwindow.h')
| -rw-r--r-- | src/server/mainwindow/mainwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 3866db5..0d0d650 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -79,6 +79,7 @@ private: void changeProjection(Client *from, Mode mode = Mode::Broadcast, Client *to = NULL); void tellClientCurrentSituation(Client* client); bool isManagerMachine(Client* client); + void reset(); void closeEvent(QCloseEvent *e); void changeEvent(QEvent *e); |