incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [49/50] git commit: [#6422] Added LICENSE file for Blueprint and pointer in base LICENSE
Date Tue, 24 Sep 2013 17:08:28 GMT
[#6422] Added LICENSE file for Blueprint and pointer in base LICENSE

License file obtained from:
https://raw.github.com/joshuaclayton/blueprint-css/master/LICENSE

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d858204e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d858204e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d858204e

Branch: refs/heads/cj/6422
Commit: d858204e64f5e6f3102ec9e24a906e5e783345e0
Parents: 4682f14
Author: Cory Johns <cjohns@slashdotmedia.com>
Authored: Tue Sep 17 20:54:31 2013 +0000
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Tue Sep 24 17:07:14 2013 +0000

----------------------------------------------------------------------
 Allura/allura/public/nf/css/blueprint/LICENSE | 22 ++++++++++++++++++++++
 LICENSE                                       | 12 ++++++++++++
 2 files changed, 34 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d858204e/Allura/allura/public/nf/css/blueprint/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/blueprint/LICENSE b/Allura/allura/public/nf/css/blueprint/LICENSE
new file mode 100644
index 0000000..13076fb
--- /dev/null
+++ b/Allura/allura/public/nf/css/blueprint/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2007 - 2010 blueprintcss.org
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d858204e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..5202aaa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,15 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+ALLURA SUBCOMPONENTS:
+
+Apache Allura includes a number of subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+
+Blueprint, which is available under the MIT license.
+For details, see Allura/allura/public/nf/css/blueprint/.


Mime
View raw message