You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ripple.apache.org by ti...@apache.org on 2015/07/23 07:20:51 UTC
incubator-ripple git commit: LICENCE and NOTICE file updates.
Repository: incubator-ripple
Updated Branches:
refs/heads/master 39a027625 -> 130b6a712
LICENCE and NOTICE file updates.
* Added '-2015' to NOTICE copyright year.
* Removed 'Apache Cordova' entry from LICENSE file.
* Added 'parseUrl' entry to LICENSE file.
* Updated copyrights for accelerometer.js.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ripple/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ripple/commit/130b6a71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ripple/tree/130b6a71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ripple/diff/130b6a71
Branch: refs/heads/master
Commit: 130b6a712d35be9e2ac6a3b5d9b653e075e312b1
Parents: 39a0276
Author: Tim Barham <ti...@microsoft.com>
Authored: Thu Jul 23 15:20:39 2015 +1000
Committer: Tim Barham <ti...@microsoft.com>
Committed: Thu Jul 23 15:20:39 2015 +1000
----------------------------------------------------------------------
LICENSE | 37 +++++--------------------------------
NOTICE | 2 +-
2 files changed, 6 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/130b6a71/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 372a9ae..1389f79 100644
--- a/LICENSE
+++ b/LICENSE
@@ -204,38 +204,10 @@
--> Kudos to third party awesomeness:
-------------------------------------------------------
-This project contains code from the Apache Cordova project.
+* parseUri *
-http://cordova.apache.org
-
-Licensed Under:
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, 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.
-
--------------------------------------------------------
-* jWorkflow *
-
-http://github.com/tinyhippos/jWorkflow/
-
-The MIT License
-http://www.opensource.org/licenses/mit-license.php
-Copyright (c) 2010 all contributors:
-Gord Tanner
+v1.2.2 (c) Steven Levithan <stevenlevithan.com>
+MIT License
-------------------------------------------------------
* jXHR.js (JSON-P XHR) *
@@ -246,7 +218,8 @@ Gord Tanner
* UI.Accelerometer Control (panel plugin) *
Licensed under the MIT license:
- Copyright Train Hack 2010
+ Copyright (c) 2010 Epic Train Hack
+ Copyright (c) 2011 Research In Motion Limited
Contributors: Wolfram Kriesing, Dan Silivestru, Brent Lintner
http://www.opensource.org/licenses/mit-license.php
http://git-wip-us.apache.org/repos/asf/incubator-ripple/blob/130b6a71/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index ec1c5eb..4015a55 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Ripple
-Copyright 2012 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org)