diff options
| author | totycro <totycro@unknown-horizons.org> | 2011-04-09 15:11:35 +0200 |
|---|---|---|
| committer | totycro <totycro@unknown-horizons.org> | 2011-04-09 15:11:35 +0200 |
| commit | 13199a5212e210206b8d6b938f7c1683760cf226 (patch) | |
| tree | cba982d54d62081589d31f188796b65fc51b703d /pacman-c++/pacman.qrc | |
| parent | 979c3b4528da1608404d6e163211280fee5da9c5 (diff) | |
| parent | 827a9b10539af4a8c4cff70fa345254668d294c7 (diff) | |
| download | foop-13199a5212e210206b8d6b938f7c1683760cf226.tar.gz foop-13199a5212e210206b8d6b938f7c1683760cf226.tar.bz2 foop-13199a5212e210206b8d6b938f7c1683760cf226.zip | |
Merge branch 'master' of git.manuel.mausz.at:/foop
Conflicts:
pacman-c++/sceneholder.cpp
pacman-c++/util.h
Diffstat (limited to 'pacman-c++/pacman.qrc')
| -rw-r--r-- | pacman-c++/pacman.qrc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pacman-c++/pacman.qrc b/pacman-c++/pacman.qrc index b116a30..4fb542e 100644 --- a/pacman-c++/pacman.qrc +++ b/pacman-c++/pacman.qrc | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | <file alias="actor2icon">pics/actor2icon.png</file> | 17 | <file alias="actor2icon">pics/actor2icon.png</file> |
| 18 | <file alias="actor3icon">pics/actor3icon.png</file> | 18 | <file alias="actor3icon">pics/actor3icon.png</file> |
| 19 | <file alias="actor4icon">pics/actor4icon.png</file> | 19 | <file alias="actor4icon">pics/actor4icon.png</file> |
| 20 | <file alias="soundon">pics/soundon.xpm</file> | ||
| 21 | <file alias="soundoff">pics/soundoff.xpm</file> | ||
| 20 | </qresource> | 22 | </qresource> |
| 21 | <qresource prefix="/sound"> | 23 | <qresource prefix="/sound"> |
| 22 | <file alias="sound1">sound/intro.ogg</file> | 24 | <file alias="sound1">sound/intro.ogg</file> |