From: Ben Morrow <childoftv@gmail.com>
Date: Tue, 20 Aug 2013 08:19:35 +0000 (-0700)
Subject: Merge branch 'master' of github.com:sugarcubes/SugarCubes
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=dea60f0c5880d41c82ecd496c9cd62b08a026eb3;hp=-c;p=SugarCubes.git

Merge branch 'master' of github.com:sugarcubes/SugarCubes
---

dea60f0c5880d41c82ecd496c9cd62b08a026eb3
diff --combined SugarCubes.pde
index 3b8253d,db21414..8012895
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -29,6 -29,7 +29,7 @@@ LXPattern[] patterns(GLucose glucose) 
      new AskewPlanes(glucose),
      new Swarm(glucose),
      new SpaceTime(glucose),
+     new HelixPattern(glucose),
      new Pong(glucose),
      new Noise(glucose),
      new Blinders(glucose),
@@@ -43,10 -44,6 +44,10 @@@
      new SoundSpikes(glucose),
      new FaceSync(glucose),
  
 +    // Jack
 +    new Swim(glucose),
 +    // new Breathe(glucose),
 +
  
      new TimPlanes(glucose),
      new TimPinwheels(glucose),