diff options
| author | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-06 15:42:33 +0200 |
| commit | 8e774982be169f33fe4f4c687885d96f1c4e5ab4 (patch) | |
| tree | f4d8042b531ef15024cd9e56a9569f3939950e96 /src/server/sessionnamewindow | |
| parent | New Feature: Showing client toolbar while vnc server is running. (diff) | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.gz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.tar.xz pvs2-8e774982be169f33fe4f4c687885d96f1c4e5ab4.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
src/client/connectwindow/connectwindow.h
Diffstat (limited to 'src/server/sessionnamewindow')
| -rw-r--r-- | src/server/sessionnamewindow/sessionnamewindow.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/sessionnamewindow/sessionnamewindow.h b/src/server/sessionnamewindow/sessionnamewindow.h index ed944c1..ee93ea2 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.h +++ b/src/server/sessionnamewindow/sessionnamewindow.h @@ -4,8 +4,7 @@ #include <QtGui> -namespace Ui -{ +namespace Ui{ class SessionName; } @@ -14,7 +13,7 @@ class SessionNameWindow : public QDialog Q_OBJECT private: - Ui::SessionName *ui; + Ui::SessionName *ui; public: SessionNameWindow(QWidget *parent = 0); |