From: root <root@cassidy.cs.princeton.edu>
Date: Tue, 8 Mar 2011 13:35:48 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: sface-0.1-5~1
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=5d9d4374df91f919e5c744906186b2769b6d09ae

Merge commit 'origin/master'
---

5d9d4374df91f919e5c744906186b2769b6d09ae
diff --cc sface/mainwindow.py
index b9de6fa,fdd52a5..6a0175e
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@@ -109,9 -100,9 +109,9 @@@ class MainWindow(QWidget)
          layout.addWidget(self.screens)
          layout.addLayout(hlayout)
          self.setLayout(layout)
-         self.resize(800, 600)
+         self.resize(800, 500)
  
 -        for link in (self.nav.main, self.nav.config):
 +        for link in (self.nav.main, self.nav.config, self.nav.help):
              self.connect(link, SIGNAL('linkActivated(QString)'),
                           self.animateToScreen)