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.pro | |
| 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.pro')
| -rw-r--r-- | pacman-c++/pacman.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro index 3ce84da..99feed0 100644 --- a/pacman-c++/pacman.pro +++ b/pacman-c++/pacman.pro | |||
| @@ -1,10 +1,12 @@ | |||
| 1 | SOURCES += main.cpp \ | 1 | SOURCES += main.cpp \ |
| 2 | pixmapitem.cpp \ | 2 | pixmapitem.cpp \ |
| 3 | actor.cpp \ | 3 | actor.cpp \ |
| 4 | animationmanager.cpp | 4 | animationmanager.cpp \ |
| 5 | block.cpp | ||
| 5 | HEADERS += pixmapitem.h \ | 6 | HEADERS += pixmapitem.h \ |
| 6 | actor.h \ | 7 | actor.h \ |
| 7 | animationmanager.h | 8 | animationmanager.h \ |
| 9 | block.h | ||
| 8 | RESOURCES += pacman.qrc | 10 | RESOURCES += pacman.qrc |
| 9 | 11 | ||
| 10 | 12 | ||