aboutsummaryrefslogtreecommitdiff
path: root/scss/ninja.scss
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-09 16:39:17 -0700
committerValerio Virgillito2012-07-09 16:46:43 -0700
commitcee0deca695359ab468bd06d0e05ed3b2010b338 (patch)
tree9d04b6728d5192b2f030669bd41969cbd7db3761 /scss/ninja.scss
parenta1c0c873e7ede1848a7aa090fb214af4765dbfaf (diff)
parenta5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18 (diff)
downloadninja-cee0deca695359ab468bd06d0e05ed3b2010b338.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Analytics
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'scss/ninja.scss')
-rwxr-xr-xscss/ninja.scss23
1 files changed, 12 insertions, 11 deletions
diff --git a/scss/ninja.scss b/scss/ninja.scss
index b2389e91..c103c117 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -1,26 +1,27 @@
1@charset "UTF-8"; 1@charset "UTF-8";
2 2
3/* <copyright> 3/* <copyright>
4Copyright (c) 2012, Motorola Mobility, Inc 4Copyright (c) 2012, Motorola Mobility LLC.
5All Rights Reserved. 5All Rights Reserved.
6BSD License.
7 6
8Redistribution and use in source and binary forms, with or without 7Redistribution and use in source and binary forms, with or without
9modification, are permitted provided that the following conditions are met: 8modification, 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
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 21THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 22AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 23IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 24ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS