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

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

1 files changed, 3 insertions, 0 deletions

diff --git a/pacman-c++/client.h b/pacman-c++/client.h
index 476b972..56f3602 100644
--- a/pacman-c++/client.h
+++ b/pacman-c++/client.h
@@ -11,6 +11,9 @@ class Client
 public:
   Client();
 
+public slots:
+  void toggleSound() const;
+
 private:
   MainWidget *m_mainWidget;
 };