Merge branch 'master' of git.manuel.mausz.at:/foop

Conflicts:
	pacman-c++/sceneholder.cpp
	pacman-c++/util.h

1 files changed, 2 insertions, 0 deletions

diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro
index a1dddf6..dd08568 100644
--- a/pacman-c++/pacman.pro
+++ b/pacman-c++/pacman.pro
@@ -8,6 +8,7 @@ SOURCES += pixmapitem.cpp \
     mainwidget.cpp \
     point.cpp \
     audioplayer.cpp \
+    clicklabel.cpp \
                 sceneholder.cpp \
                 util.cpp
 HEADERS += pixmapitem.h \
@@ -20,6 +21,7 @@ HEADERS += pixmapitem.h \
     constants.h \
     point.h \
     audioplayer.h \
+    clicklabel.h \
                 sceneholder.h \
                 util.h
 RESOURCES += pacman.qrc