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

Conflicts:
	pacman-c++/mainwidget.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/pacman-c++/client.cpp b/pacman-c++/client.cpp
index a5cb7c5..cf3c291 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client.cpp
@@ -4,10 +4,10 @@ Client::Client()
 {
   QAction *quitAction = new QAction("E&xit", this);
   connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
-  
+
   QMenu *fileMenu = menuBar()->addMenu("File");
   fileMenu->addAction(quitAction);
-  
+
   mainWidget = new MainWidget();
   setCentralWidget(mainWidget);
 }
@@ -16,11 +16,11 @@ Client::Client()
 int main(int argc, char ** argv) {
   QApplication app(argc, argv);
   app.setApplicationName("pacman-client");
-  
+
   qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
-  
+
   Client client;
   client.show();
-  
+
   return app.exec();
 }