diff options
| author | Eric Guzman | 2012-04-23 11:55:55 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-23 11:55:55 -0700 |
| commit | cdd1189e349e2974681e2c451e861e5b0db570e4 (patch) | |
| tree | d8823c3d050e011032c563d20c1a5f61e67ae740 | |
| parent | c0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff) | |
| parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
| download | ninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
126 files changed, 8358 insertions, 4914 deletions
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index 0374e6a3..a9fbfbd9 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -12,15 +12,7 @@ | |||
| 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 12 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 13 | 13 | ||
| 14 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> | 14 | <link rel="stylesheet" type="text/css" href="css/colorwheel.css"> |
| 15 | 15 | ||
| 16 | <script type="text/m-objects"> | ||
| 17 | { | ||