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

Conflicts:
	pacman-c++/pacman.pro

1 files changed, 35 insertions, 0 deletions

diff --git a/pacman-c++/pacman.server.pro b/pacman-c++/pacman.server.pro
new file mode 100644
index 0000000..ae9dd2e
--- /dev/null
+++ b/pacman-c++/pacman.server.pro
@@ -0,0 +1,35 @@
+QT += phonon
+SOURCES += pixmapitem.cpp \
+    actor.cpp \
+    animationmanager.cpp \
+    block.cpp \
+    server.cpp \
+    bonuspoint.cpp \
+    mainwidget.cpp \
+    point.cpp \
+    audioplayer.cpp \
+                sceneholder.cpp \
+                util.cpp
+HEADERS += pixmapitem.h \
+    actor.h \
+    animationmanager.h \
+    block.h \
+    server.h \
+    bonuspoint.h \
+    mainwidget.h \
+    constants.h \
+    point.h \
+    audioplayer.h \
+                sceneholder.h \
+                util.h
+RESOURCES += pacman.qrc
+
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+RC_FILE = pacman.rc
+
+OTHER_FILES += \
+    style.qss \
+    pacman.rc
+
+DEFINES += SERVER