diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/colorbar.reel/css | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/colorbar.reel/css')
| -rwxr-xr-x | js/components/colorbar.reel/css/colorbar.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/colorbar.reel/css/colorbar.scss b/js/components/colorbar.reel/css/colorbar.scss index 086aa1ea..e9ecdc30 100755 --- a/js/components/colorbar.reel/css/colorbar.scss +++ b/js/components/colorbar.reel/css/colorbar.scss | |||
| @@ -31,5 +31,5 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 31 | 31 | ||
| 32 | .colorbar | 32 | .colorbar |
| 33 | { | 33 | { |
| 34 | cursor: crosshair; | 34 | cursor: crosshair; |
| 35 | } | 35 | } |