summaryrefslogtreecommitdiffstats
path: root/src/gui/clientConfigDialog.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'openslx/master' into mcastftSebastien Braun2010-10-051-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt pvsmgr.qrc src/gui/clientConfigDialog.cpp src/gui/mainWindow.cpp src/gui/ui/mainwindow.ui src/gui/ui/mainwindowtouch.ui src/pvs.cpp src/pvs.h src/pvsDaemon.cpp src/pvsgui.cpp
| * Configuration by pvs via D-Bus. Old .allow ist now deprecated, config file: ↵Johann Latocha2010-07-101-0/+2
| | | | | | | | .config/openslx/pvs.conf
* | Remove system-dependent interface enumeration code and introduce properSebastien Braun2010-10-051-2/+3
| | | | | | | | Model-View portable code in its stead.
* | Make PGM interface configurableSebastien Braun2010-08-041-0/+2
|/
* initial import of latest svn versionSebastian2010-05-121-0/+44