diff options
author | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
---|---|---|
committer | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
commit | 0cb19c0a597bfb7a6cac416fb5c0b0a89043081e (patch) | |
tree | 1c076c798ae6ce960bccde2e0aea675143d961d8 /doc | |
parent | Fix SIGSEGV-generating lookup bug when incoming multicast transfers are retried (diff) | |
parent | [PVSGUI] parsing cmdargs fixed (diff) | |
download | pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.gz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.xz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.zip |
Merge remote branch 'openslx/master' into mcastft
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
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions