diff options
| author | Jon Reid | 2012-04-10 14:52:23 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-04-10 14:52:23 -0700 |
| commit | c19987997758cf47ac9b93a2a767a0e2a9072745 (patch) | |
| tree | eb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | 03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff) | |
| parent | 422b14fc60be84c116115f2e71e3499e232f3f05 (diff) | |
| download | ninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 | ||