Merge branches 'level' and 'master' into level

This commit is contained in:
kleph 2010-01-16 01:36:00 +01:00
commit c283049246

View file

@ -431,7 +431,7 @@ while not globals.die:
# reinitializing moving objects list # reinitializing moving objects list
#globals.moving_objects = pygame.sprite.RenderUpdates() #globals.moving_objects = pygame.sprite.RenderUpdates()
# transition(0) #transition(0)
print "frames : %d" % nbframe print "frames : %d" % nbframe