diff options
| author | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
| commit | f07fc3b426815e28fde23313242fbbb998a08d45 (patch) | |
| tree | ba9eda1a83135a1727d2d35661d6facabee53b95 /pvsgui.qrc | |
| parent | Fix recognition of letters in keyboard handler (diff) | |
| parent | Merge remote branch 'openslx/master' into mcastft (diff) | |
| download | pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.gz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.xz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.zip | |
Merge remote branch 'openslx/mcastft' into input
Conflicts:
CMakeLists.txt
i18n/pvs_ar_JO.ts
i18n/pvs_de_DE.ts
i18n/pvs_es_MX.ts
i18n/pvs_fr_FR.ts
i18n/pvs_pl_PL.ts
i18n/pvsmgr_ar_JO.ts
i18n/pvsmgr_de_DE.ts
i18n/pvsmgr_es_MX.ts
i18n/pvsmgr_fr_FR.ts
i18n/pvsmgr_pl_PL.ts
icons/README
pvsmgr.qrc
src/gui/mainWindow.cpp
src/pvs.cpp
src/pvs.h
src/pvsDaemon.cpp
src/util/clientGUIUtils.h
Diffstat (limited to 'pvsgui.qrc')
| -rw-r--r-- | pvsgui.qrc | 30 |
1 files changed, 0 insertions, 30 deletions
@@ -10,34 +10,4 @@ <file alias="AUTHORS">AUTHORS</file> <file alias="TRANSLATION">TRANSLATION</file> </qresource> - <qresource prefix="/" lang="de_DE"> - <file alias="pvsgui.qm">build/pvsgui_de_DE.qm</file> - </qresource> - <qresource prefix="/" lang="de"> - <file alias="pvsgui.qm">build/pvsgui_de_DE.qm</file> - </qresource> - <qresource prefix="/" lang="fr_FR"> - <file alias="pvsgui.qm">build/pvsgui_fr_FR.qm</file> - </qresource> - <qresource prefix="/" lang="fr"> - <file alias="pvsgui.qm">build/pvsgui_fr_FR.qm</file> - </qresource> - <qresource prefix="/" lang="es_MX"> - <file alias="pvsgui.qm">build/pvsgui_es_MX.qm</file> - </qresource> - <qresource prefix="/" lang="es"> - <file alias="pvsgui.qm">build/pvsgui_es_MX.qm</file> - </qresource> - <qresource prefix="/" lang="ar_JO"> - <file alias="pvsgui.qm">build/pvsgui_ar_JO.qm</file> - </qresource> - <qresource prefix="/" lang="ar"> - <file alias="pvsgui.qm">build/pvsgui_ar_JO.qm</file> - </qresource> - <qresource prefix="/" lang="pl_PL"> - <file alias="pvsgui.qm">build/pvsgui_pl_PL.qm</file> - </qresource> - <qresource prefix="/" lang="pl"> - <file alias="pvsgui.qm">build/pvsgui_pl_PL.qm</file> - </qresource> </RCC> |