diff options
| author | Jose Antonio Marquez | 2012-04-10 11:24:21 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-04-10 11:24:21 -0700 |
| commit | d14f78b06d37aa469885f2ecf84419bcb7e3e613 (patch) | |
| tree | 91b95c6c9aef779a743b710105546a8ae74bff12 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | a9bcc403df76ad2cb7c31ff7fdd42a85c35cf424 (diff) | |
| parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
| download | ninja-d14f78b06d37aa469885f2ecf84419bcb7e3e613.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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 | ||