diff options
| author | Fabian Schillinger | 2010-11-05 02:10:04 +0100 |
|---|---|---|
| committer | Fabian Schillinger | 2010-11-05 02:10:04 +0100 |
| commit | c850c907ff61bf4798bdb4fa59f4679f9ba1287a (patch) | |
| tree | 61aa14589cbec54eaf14b4b9f8e9100da28af9e8 /src/gui/mainWindow.h | |
| parent | Process start/stop/view functionality (diff) | |
| parent | Merge remote branch 'origin/master' (diff) | |
| download | pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.tar.gz pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.tar.xz pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
src/gui/mainWindow.cpp
Diffstat (limited to 'src/gui/mainWindow.h')
| -rw-r--r-- | src/gui/mainWindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h index 671bf38..272d057 100644 --- a/src/gui/mainWindow.h +++ b/src/gui/mainWindow.h @@ -178,6 +178,8 @@ public slots: void clientlisthide(); void projecttoolbar(); void unprojecttoolbar(); + void closeUp(ConnectionFrame* connFrame, PVSClient* client = 0); + void unCloseUp(ConnectionFrame* connFrame); void closeUp(); void foto(); void backgroundpicture(); |