diff options
| author | hwc487 | 2012-04-13 11:52:13 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-13 11:52:13 -0700 |
| commit | 4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch) | |
| tree | 3dc2e3c5a041179eed38eab1a00f851554e50005 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | 521df0ed9242efff45715998837068c87aca7efd (diff) | |
| parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
| download | ninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.html')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index 34f68554..ae0ee2c8 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
| @@ -104,7 +104,7 @@ | |||
| 104 | 104 | ||
| 105 | <hr /> | 105 | <hr /> |
| 106 | 106 | ||
| 107 | <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;"> | 107 | <div id="mp_properties_list" class="mp_properties_list"> |
| 108 | <div id="mp_property" class="mp_property"></div> | 108 | <div id="mp_property" class="mp_property"></div> |
| 109 | </div> | 109 | </div> |
| 110 | 110 | ||