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 /icons | |
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 'icons')
0 files changed, 0 insertions, 0 deletions