diff options
| author | Eric Guzman | 2012-04-09 15:44:09 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-09 15:44:09 -0700 |
| commit | a27915e900eb768dd9db1f0dd441961ea80bfaa6 (patch) | |
| tree | 593f429f0b3294103a059ae9f6ed03858288deb7 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | afcaa157f7bc067cf00de91b43b2a71e9b64b7b3 (diff) | |
| parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
| download | ninja-a27915e900eb768dd9db1f0dd441961ea80bfaa6.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 | ||