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 /pvsmgr.qrc | |
| 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 'pvsmgr.qrc')
| -rw-r--r-- | pvsmgr.qrc | 71 |
1 files changed, 22 insertions, 49 deletions
@@ -1,59 +1,32 @@ <RCC> - <qresource prefix="/" > + <qresource prefix="/"> + <file>icons/gears.png</file> <file>icons/projection.png</file> <file>icons/reset.png</file> - <file alias="finder" >icons/finder.png</file> - <file alias="exit" >icons/exit.png</file> - <file alias="terminal" >icons/terminal.png</file> - <file alias="photo" >icons/photo.png</file> - <file alias="photos" >icons/photo2.png</file> - <file alias="logout" >icons/log-out.png</file> - <file alias="restore" >icons/view-restore.png</file> - <file alias="lock" >icons/lock.png</file> - <file alias="profile" >icons/profile.png</file> - <file alias="dozent" >icons/dozent.svg</file> - <file alias="offline" >icons/offline.png</file> - <file alias="online" >icons/online.png</file> - <file alias="source" >icons/source.png</file> - <file alias="target" >icons/target.png</file> - <file alias="dozent2" >icons/dozent.png</file> - <file alias="chat" >icons/chat.png</file> - <file alias="cam32" >icons/cam32.svg</file> - <file alias="netconf" >icons/network_configure.png</file> + <file alias="finder">icons/finder.png</file> + <file alias="exit">icons/exit.png</file> + <file alias="terminal">icons/terminal.png</file> + <file alias="photo">icons/photo.png</file> + <file alias="photos">icons/photo2.png</file> + <file alias="logout">icons/log-out.png</file> + <file alias="restore">icons/view-restore.png</file> + <file alias="lock">icons/lock.png</file> + <file alias="profile">icons/profile.png</file> + <file alias="dozent">icons/dozent.svg</file> + <file alias="offline">icons/offline.png</file> + <file alias="online">icons/online.png</file> + <file alias="source">icons/source.png</file> + <file alias="target">icons/target.png</file> + <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="AUTHORS">AUTHORS</file> - <file alias="TRANSLATION">TRANSLATION</file> + <file alias="TRANSLATION">TRANSLATION</file> </qresource> - <qresource prefix="/" lang="de_DE" > + <qresource prefix="/" lang="de_DE"> <file>icons/unprojection.png</file> <file>icons/unlocksingle.png</file> <file>icons/locksingle.png</file> - <file alias="pvsmgr.qm" >build/pvsmgr_de_DE.qm</file> - </qresource> - <qresource prefix="/" lang="de" > - <file alias="pvsmgr.qm" >build/pvsmgr_de_DE.qm</file> - </qresource> - <qresource prefix="/" lang="fr_FR" > - <file alias="pvsmgr.qm" >build/pvsmgr_fr_FR.qm</file> - </qresource> - <qresource prefix="/" lang="fr" > - <file alias="pvsmgr.qm" >build/pvsmgr_fr_FR.qm</file> - </qresource> - <qresource prefix="/" lang="es_MX" > - <file alias="pvsmgr.qm" >build/pvsmgr_es_MX.qm</file> - </qresource> - <qresource prefix="/" lang="es" > - <file alias="pvsmgr.qm" >build/pvsmgr_es_MX.qm</file> - </qresource> - <qresource prefix="/" lang="ar_JO" > - <file alias="pvsmgr.qm" >build/pvsmgr_ar_JO.qm</file> - </qresource> - <qresource prefix="/" lang="ar" > - <file alias="pvsmgr.qm" >build/pvsmgr_ar_JO.qm</file> - </qresource> - <qresource prefix="/" lang="pl_PL" > - <file alias="pvsmgr.qm" >build/pvsmgr_pl_PL.qm</file> - </qresource> - <qresource prefix="/" lang="pl" > - <file alias="pvsmgr.qm" >build/pvsmgr_pl_PL.qm</file> </qresource> </RCC> |