diff options
| author | Manuel Schneider | 2014-05-06 15:25:13 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-05-06 15:25:13 +0200 |
| commit | 9d92e6f2202339de585b6bd5c3858e03b89651f0 (patch) | |
| tree | acb8e72d3b9f60fcad0ac4fa3af00db20a90133e /src/server/connectionframe/connectionframe.cpp | |
| parent | Changes the approach of Qt Gui initialization to the member pointer approach.... (diff) | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.tar.gz pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.tar.xz pvs2-9d92e6f2202339de585b6bd5c3858e03b89651f0.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
gui/client/toolbar.ui
src/client/connectwindow/connectwindow.cpp
Diffstat (limited to 'src/server/connectionframe/connectionframe.cpp')
0 files changed, 0 insertions, 0 deletions