aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
diff options
context:
space:
mode:
authorKruti Shah2012-07-09 11:27:16 -0700
committerKruti Shah2012-07-09 11:27:16 -0700
commit5ad509e46add1b45d15d1c493e18a5c52a462654 (patch)
tree93cd416cd7060e3688f33545f70956f787f6886f /js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
parent6e29c88846e12757f127f0ce8e8cbb737ab8c880 (diff)
parent39aa69624e1e3b8598b0242ee6ec436862b67280 (diff)
downloadninja-5ad509e46add1b45d15d1c493e18a5c52a462654.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode
Conflicts: js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html')
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html32
1 files changed, 28 insertions, 4 deletions
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
index 99021917..cbdd474a 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -1,8 +1,32 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3Copyright (c) 2012, Motorola Mobility, Inc
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4All Rights Reserved.
5(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5BSD License.
6
7Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met:
9
10 - Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright
13 notice, this list of conditions and the following disclaimer in the
14 documentation and/or other materials provided with the distribution.
15 - Neither the name of Motorola Mobility nor the names of its contributors
16 may be used to endorse or promote products derived from this software
17 without specific prior written permission.
18
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE.
6</copyright> --> 30</copyright> -->
7<html lang="en"> 31<html lang="en">
8<head> 32<head>
@@ -66,4 +90,4 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
66 <dl id="declaration-list"></dl> 90 <dl id="declaration-list"></dl>
67</li> 91</li>
68</body> 92</body>
69</html> \ No newline at end of file 93</html>