From: Jack Stahl <jackstah@gmail.com>
Date: Sun, 24 Nov 2013 01:36:03 +0000 (-0800)
Subject: Merge pull request #14 from vincentsiao/master
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=f56322be7738e82eb5d9e36fbd10d48e3ff492cd;p=SugarCubes.git

Merge pull request #14 from vincentsiao/master

Asana Thankshackathon / VSTowers
---

f56322be7738e82eb5d9e36fbd10d48e3ff492cd
diff --cc SugarCubes.pde
index 2024c40,6651e18..88f229a
--- a/SugarCubes.pde
+++ b/SugarCubes.pde
@@@ -65,12 -65,10 +65,15 @@@ LXPattern[] patterns(GLucose glucose) 
      // new TimTrace(glucose),
      new TimSpheres(glucose),
  
 +    // Jackie
 +    new JackieSquares(glucose),
 +    new JackieLines(glucose),
 +    new JackieDots(glucose),
 +
  
+ 
+     // Vincent
+     new VSTowers(glucose),
      
      // Toby
      new GlitchPlasma(glucose),