aboutsummaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-16 13:15:27 -0700
committerValerio Virgillito2012-07-16 13:15:27 -0700
commitfe1e956b527c2cf4ecf10645810f3ff750e9e522 (patch)
tree2cde04bfd925092c30cedabebad2d247c69c373d /css
parent289e821c819d0fded21b97ec6e4ed27dd6f30ab4 (diff)
parent156f15cec3203528a78783d075d4b8f1eb40c06d (diff)
downloadninja-fe1e956b527c2cf4ecf10645810f3ff750e9e522.tar.gz
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'css')
-rwxr-xr-xcss/ninja.css11
1 files changed, 3 insertions, 8 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 29cdcd02..288156b6 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -6,16 +6,11 @@ All Rights Reserved.
6Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
8 8
9* Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
10 this list of conditions and the following disclaimer.
11 10
12* Redistributions in binary form must reproduce the above copyright notice, 11* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
13 this list of conditions and the following disclaimer in the documentation
14 and/or other materials provided with the distribution.
15 12
16* Neither the name of Motorola Mobility LLC nor the names of its 13* Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
17 contributors may be used to endorse or promote products derived from this
18 software without specific prior written permission.
19 14
20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 15THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE