diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-04 10:47:46 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-04 10:47:46 -0500 |
| commit | 5b90941441be6ef6c945f7bdf3489db65aff90ee (patch) | |
| tree | f8c8bb45a584d1b7ee7c84fc8b4033a097039f00 /util | |
| parent | dcc7afcea31c968575446b7f215d6780f747d7fb (diff) | |
| parent | 69449f1991952cee28c597f1a2bbb3f927751447 (diff) | |
Merge branch 'performance'
Conflicts:
config/Outdoor.xml
util/ColorOps.py
Diffstat (limited to 'util')
| -rw-r--r-- | util/ColorOps.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/ColorOps.py b/util/ColorOps.py index da1e704..143444f 100644 --- a/util/ColorOps.py +++ b/util/ColorOps.py @@ -1,4 +1,5 @@ import random +from util.TimeOps import Stopwatch def randomColor(): return [random.randint(0,255) for i in range(3)] def chooseRandomColor(colorList): |