diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-27 17:21:23 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-27 17:21:23 -0500 |
| commit | 890e167b2cd2a438f81a759833fc4f1c876c4142 (patch) | |
| tree | 71b12f331fc7877d021f04c7abc231bbd853da98 /pixelcore | |
| parent | 5fb3ea060025241105dc8e9a174513c112f9a133 (diff) | |
| parent | 51d58d511d474cb01339d504624b9418c75869e3 (diff) | |
Merge branch 'osc'
Conflicts:
behaviors/Square.py
pixelcore/PixelStrip.py
Diffstat (limited to 'pixelcore')
| -rw-r--r-- | pixelcore/PixelStrip.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pixelcore/PixelStrip.py b/pixelcore/PixelStrip.py index 595ce72..29d3b31 100644 --- a/pixelcore/PixelStrip.py +++ b/pixelcore/PixelStrip.py @@ -17,8 +17,4 @@ class PixelStrip: def __iter__(self): return self.pixels.__iter__() - - - - |