From: Simon Cross <hodgestar@gmail.com>
Date: Sun, 11 May 2014 14:53:31 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://ctpug.org.za/naja
X-Git-Tag: 0.1~428
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=8298f564c4f55b062b59185ea971b4f17aa37b50;p=naja.git

Merge branch 'master' of git+ssh://ctpug.org.za/naja
---

8298f564c4f55b062b59185ea971b4f17aa37b50
diff --cc naja/__main__.py
index 0bf9c50,5ed1914..1ac982e
--- a/naja/__main__.py
+++ b/naja/__main__.py
@@@ -21,6 -20,9 +21,10 @@@ def main()
      sound.init()
  
      screen = pygame.display.get_surface()
 -    engine = Engine(screen)
 +    scene = MenuScene()
 +    engine = Engine(screen, scene)
      engine.run()
+ 
+ 
+ if __name__ == '__main__':
+     main()