diff options
| author | Björn Hagemeister | 2014-05-22 15:28:53 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-05-22 15:28:53 +0200 |
| commit | 2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b (patch) | |
| tree | bd02cb4e67fef2edcc64ec698ba4be1f8e4a0881 /pvsmgr.qrc | |
| parent | Changed the blinking red dot in toolbar while beeing vnc server to blinking eye. (diff) | |
| parent | Stop suggesting the user to be recorded: (diff) | |
| download | pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.tar.gz pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.tar.xz pvs2-2834b4e955e8498b4ad4b45ef3bda6c6cf84ba9b.zip | |
Merge branch 'master' of git.openslx.org:pvs2
(Eye icon for VNC streaming)
Conflicts:
pvsclient.qrc
src/client/toolbar/toolbar.cpp
Diffstat (limited to 'pvsmgr.qrc')
| -rw-r--r-- | pvsmgr.qrc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -13,8 +13,8 @@ <file alias="tutor2student">icons/tutor2student.svg</file> <file alias="stopprojection">icons/stopprojection.svg</file> <file alias="reset">icons/keyboard_key.svg</file> - <file alias="student2tutorextension">icons/student2tutor_extension.svg</file> - <file alias="helpme">icons/help.svg</file> + <file alias="student2tutorextension">icons/student2tutor_extension.svg</file> + <file alias="helpme">icons/help.svg</file> <file alias="AUTHORS">AUTHORS</file> <file alias="TRANSLATION">TRANSLATION</file> <file alias="pvsmgr.qm">build/pvsmgr_de_DE.qm</file> |