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

Conflicts:
	pacman-c++/main.cpp
	pacman-c++/pacman.qrc

1 files changed, 14 insertions, 0 deletions

diff --git a/pacman-c++/block.h b/pacman-c++/block.h
new file mode 100644
index 0000000..25a331c
--- /dev/null
+++ b/pacman-c++/block.h
@@ -0,0 +1,14 @@
+#ifndef BLOCK_H
+#define BLOCK_H
+
+#include "pixmapitem.h"
+#include "actor.h"
+
+class Block
+  : public PixmapItem {
+public:
+  Block(Actor::Type type);
+
+};
+
+#endif  // BLOCK_H