diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/components/colorwheel.reel | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/components/colorwheel.reel')
| -rw-r--r-- | js/components/colorwheel.reel/compass_app_log.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/js/components/colorwheel.reel/compass_app_log.txt b/js/components/colorwheel.reel/compass_app_log.txt deleted file mode 100644 index 815feb02..00000000 --- a/js/components/colorwheel.reel/compass_app_log.txt +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | 2011-11-23 01:07:12 create css/colorwheel.css | ||
| 2 | 2011-11-23 01:07:25 overwrite css/colorwheel.css | ||
| 3 | 2011-12-20 17:04:05 overwrite css/colorwheel.css | ||