diff options
| author | manuel <manuel@mausz.at> | 2011-04-04 14:45:43 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2011-04-04 14:45:43 +0200 |
| commit | b310b66be264330e271f4929065cd61f0b0d8bf4 (patch) | |
| tree | 70545d73cc58ef7a441335fdc5d2f0f683ef6d49 /pacman-c++/pacman.qrc | |
| parent | 471177aad38350840eed6452b1ad8723b61c330d (diff) | |
| parent | de2f8fbd228910b608e8dea5dc7c16d9f99495f8 (diff) | |
| download | foop-b310b66be264330e271f4929065cd61f0b0d8bf4.tar.gz foop-b310b66be264330e271f4929065cd61f0b0d8bf4.tar.bz2 foop-b310b66be264330e271f4929065cd61f0b0d8bf4.zip | |
Merge branch 'master' of ssh://manuel.mausz.at/foop
Conflicts:
pacman-c++/main.cpp
pacman-c++/pacman.qrc
Diffstat (limited to 'pacman-c++/pacman.qrc')
| -rw-r--r-- | pacman-c++/pacman.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pacman-c++/pacman.qrc b/pacman-c++/pacman.qrc index 196ee43..6a7fefb 100644 --- a/pacman-c++/pacman.qrc +++ b/pacman-c++/pacman.qrc | |||
| @@ -4,5 +4,6 @@ | |||
| 4 | <file alias="actor2">pics/actor2.png</file> | 4 | <file alias="actor2">pics/actor2.png</file> |
| 5 | <file alias="actor3">pics/actor3.png</file> | 5 | <file alias="actor3">pics/actor3.png</file> |
| 6 | <file alias="actor4">pics/actor4.png</file> | 6 | <file alias="actor4">pics/actor4.png</file> |
| 7 | <file alias="block1">pics/block1.png</file> | ||
| 7 | </qresource> | 8 | </qresource> |
| 8 | </RCC> | 9 | </RCC> |