diff options
| author | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
|---|---|---|
| committer | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
| commit | ea3fb17345e5f82db9f2e98a8062e95797700ace (patch) | |
| tree | 1da0d1a8ec9455364386af78762d0f6fed187824 /pvsmgr.qrc | |
| parent | Process start/stop/view functionality (diff) | |
| parent | [PVSGUI] No X required for --help and --version (diff) | |
| download | pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.gz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.xz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
CMakeLists.txt
src/core/pvsConnectionManager.cpp
src/pvs.cpp
src/pvs.h
Diffstat (limited to 'pvsmgr.qrc')
| -rw-r--r-- | pvsmgr.qrc | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -21,6 +21,9 @@ <file alias="dozent2">icons/dozent.png</file> <file alias="chat">icons/chat.png</file> <file alias="cam32.svg">icons/cam32.svg</file> + <file alias="netconf">icons/network_configure.png</file> + <file alias="remotecontrol" >icons/remote-control.png</file> + <file alias="remotecontrolall" >icons/remote-control-all.png</file> <file alias="AUTHORS">AUTHORS</file> <file alias="TRANSLATION">TRANSLATION</file> </qresource> |