From: David Sharpe <decoydavid@gmail.com>
Date: Sun, 11 May 2014 16:32:11 +0000 (+0200)
Subject: merge
X-Git-Tag: 0.1~413
X-Git-Url: https://git.ctpug.org.za/?p=naja.git;a=commitdiff_plain;h=9299925383d4746e7f9c4e948e083a1bff1e339a

merge
---

9299925383d4746e7f9c4e948e083a1bff1e339a
diff --cc naja/scenes/menu.py
index a72beff,a13abcf..b17f611
--- a/naja/scenes/menu.py
+++ b/naja/scenes/menu.py
@@@ -14,10 -13,8 +14,11 @@@ class MenuScene(Scene)
  
      def __init__(self):
          super(MenuScene, self).__init__()
+         self.widgets.append(TextWidget((10, 10), 'Haai', fontsize=32,
 +        self.widgets.append(TextWidget((10, 10), 'Naja',
                              colour=(255, 255, 255)))
 +        self.credits_menu = CreditsScene()
 +        self.credits_menu.set_base_menu(self)
  
      def handle_event(self, ev):
          if ev.type == pgl.KEYUP and ev.key in (pgl.K_q, pgl.K_ESCAPE):