diff options
| author | Ananya Sen | 2012-04-17 18:11:55 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-04-17 18:11:55 -0700 |
| commit | 35abad196cc9feb76ef50c1b63032a38233a6d51 (patch) | |
| tree | 914689c66d4ab6c6e088b571eade0a0e35082916 /js/panels/Materials/materials-popup.reel/materials-popup.html | |
| parent | 1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff) | |
| parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
| download | ninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
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 | ||