incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hermw...@apache.org
Subject webos commit: CB-897 update webos apache headers / license headers
Date Mon, 11 Jun 2012 22:37:50 GMT
Updated Branches:
  refs/heads/master d5a32bde7 -> 14541f2ae


CB-897 update webos apache headers / license headers


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/commit/14541f2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/tree/14541f2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/diff/14541f2a

Branch: refs/heads/master
Commit: 14541f2aee4cde08c21f87af26c75c7257475c48
Parents: d5a32bd
Author: Herm Wong <hermwong@apache.org>
Authored: Mon Jun 11 15:37:33 2012 -0700
Committer: Herm Wong <hermwong@apache.org>
Committed: Mon Jun 11 15:37:33 2012 -0700

----------------------------------------------------------------------
 Makefile            |   19 +++++++++++++++++++
 NOTICE              |    3 +++
 lib/thumbs.0.5.2.js |   24 ++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/blob/14541f2a/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ea7520b..987a8cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 GREP = /usr/bin/grep
 CUT = /usr/bin/cut
 SHELL = /bin/sh

http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/blob/14541f2a/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index da2e5a3..6898bb3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,9 @@
 Modifications to phonegap-core.js (compassAPI) and compass.js (adapted from accelerometer.js)
are
 Copyright 2012 Hewlett-Packard Development Company, L.P.
 
+This product includes thumbs.js developed by Michael Brooks
+Copyright 2010 Michael Brooks (https://github.com/mwbrooks/thumbs.js)
+
 Apache Cordova
 Copyright 2012 The Apache Software Foundation
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/blob/14541f2a/lib/thumbs.0.5.2.js
----------------------------------------------------------------------
diff --git a/lib/thumbs.0.5.2.js b/lib/thumbs.0.5.2.js
index 3228f84..c5770c6 100644
--- a/lib/thumbs.0.5.2.js
+++ b/lib/thumbs.0.5.2.js
@@ -1,3 +1,27 @@
+/*
+The MIT License
+
+Copyright (c) 2010 Michael Brooks
+
+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.
+*/
+
 (function(window) {
 
     /**


Mime
View raw message