diff options
author | Jose Antonio Marquez | 2012-07-09 16:39:17 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 16:46:43 -0700 |
commit | cee0deca695359ab468bd06d0e05ed3b2010b338 (patch) | |
tree | 9d04b6728d5192b2f030669bd41969cbd7db3761 /js/panels/Timeline/Span.reel/scss | |
parent | a1c0c873e7ede1848a7aa090fb214af4765dbfaf (diff) | |
parent | a5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18 (diff) | |
download | ninja-cee0deca695359ab468bd06d0e05ed3b2010b338.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Analytics
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Span.reel/scss')
-rw-r--r-- | js/panels/Timeline/Span.reel/scss/Span.scss | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/js/panels/Timeline/Span.reel/scss/Span.scss b/js/panels/Timeline/Span.reel/scss/Span.scss index c166114b..0e2d61af 100644 --- a/js/panels/Timeline/Span.reel/scss/Span.scss +++ b/js/panels/Timeline/Span.reel/scss/Span.scss | |||
@@ -1,26 +1,27 @@ | |||
1 | @charset "UTF-8"; | 1 | @charset "UTF-8"; |
2 | 2 | ||
3 | /* <copyright> | 3 | /* <copyright> |
4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility LLC. |
5 | All Rights Reserved. | 5 | All Rights Reserved. |
6 | BSD License. | ||
7 | 6 | ||
8 | Redistribution and use in source and binary forms, with or without | 7 | Redistribution and use in source and binary forms, with or without |
9 | modification, are permitted provided that the following conditions are met: | 8 | modification, are permitted provided that the following conditions are met: |
10 | 9 | ||
11 | - Redistributions of source code must retain the above copyright notice, | 10 | * Redistributions of source code must retain the above copyright notice, |
12 | this list of conditions and the following disclaimer. | 11 | this list of conditions and the following disclaimer. |
13 | - Redistributions in binary form must reproduce the above copyright | 12 | |
14 | notice, this list of conditions and the following disclaimer in the | 13 | * Redistributions in binary form must reproduce the above copyright notice, |
15 | documentation and/or other materials provided with the distribution. | 14 | this list of conditions and the following disclaimer in the documentation |
16 | - Neither the name of Motorola Mobility nor the names of its contributors | 15 | and/or other materials provided with the distribution. |
17 | may be used to endorse or promote products derived from this software | 16 | |
18 | without specific prior written permission. | 17 | * Neither the name of Motorola Mobility LLC nor the names of its |
18 | contributors may be used to endorse or promote products derived from this | ||
19 | software without specific prior written permission. | ||
19 | 20 | ||
20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 22 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 23 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 24 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 25 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 26 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 27 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |