diff options
| author | hwc487 | 2012-02-23 15:21:56 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-23 15:21:56 -0800 |
| commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
| tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/panels/Timeline/Layer.reel/Layer.html | |
| parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
| parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
| download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.js
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index dd819b2b..e262afe2 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
| @@ -153,7 +153,7 @@ | |||
| 153 | <div class="label-style"> | 153 | <div class="label-style"> |
| 154 | <span class="collapsible-label">Style</span> | 154 | <span class="collapsible-label">Style</span> |
| 155 | <span class="clicker-style collapsible-clicker"></span> | 155 | <span class="clicker-style collapsible-clicker"></span> |
| 156 | <div class="cssbutton button-delete"></div> | 156 | <div class="cssbutton button-delete disabled"></div> |
| 157 | <div class="cssbutton button-add"></div> | 157 | <div class="cssbutton button-add"></div> |
| 158 | </div> | 158 | </div> |
| 159 | <div class="content-style collapsible-content"> | 159 | <div class="content-style collapsible-content"> |