incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [1/4] git commit: Updated license and notice
Date Tue, 29 May 2012 11:50:26 GMT
Updated Branches:
  refs/heads/master efcec3d92 -> 6dd248d92


Updated license and notice


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/commit/6dd248d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/tree/6dd248d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/diff/6dd248d9

Branch: refs/heads/master
Commit: 6dd248d9283aa3e856518e47e8880e3323476203
Parents: 9eca638
Author: Tim Kim <timk@adobe.com>
Authored: Tue May 1 15:07:24 2012 -0700
Committer: Tim Kim <timk@adobe.com>
Committed: Tue May 1 15:07:24 2012 -0700

----------------------------------------------------------------------
 bin/LICENSE |   79 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 bin/NOTICE  |    3 +-
 2 files changed, 77 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/blob/6dd248d9/bin/LICENSE
----------------------------------------------------------------------
diff --git a/bin/LICENSE b/bin/LICENSE
index 52c12cd..8008275 100644
--- a/bin/LICENSE
+++ b/bin/LICENSE
@@ -256,6 +256,10 @@ For the template/project/lib/ant-contrib/ant-contrib-1.0b3.jar component:
 // BADA LICENSES
 
    ====================================================================   
+
+// BADAWAC LICENSES
+
+   ====================================================================    
    
 // BLACKBERRY LICENSES
 
@@ -281,12 +285,24 @@ For the template/project/www/json2.js component:
 
 // DOCS LICENSES
 
-Copyright (c) 2010-2011 Nitobi
-website: http://phonegap.com
+--------------------------------------------------------------
+jasmine from GitHub
+
+   https://github.com/pivotal/jasmine
+
+MIT-style license
+
+license available from:
+
+   https://github.com/pivotal/jasmine/blob/master/MIT.LICENSE
+   
+-----------------------------
+
+Copyright (c) 2008-2011 Pivotal Labs
 
 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
+"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
@@ -294,7 +310,7 @@ 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
@@ -303,6 +319,61 @@ 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.
 
+
+--------------------------------------------------------------
+commonjs tests from the commonjs organization at GitHub
+
+   https://github.com/commonjs/commonjs
+
+MIT-style license
+
+license available from:
+
+   https://github.com/commonjs/commonjs/blob/master/docs/license.html.markdown
+
+contributor list available from:
+
+   https://github.com/commonjs/commonjs/blob/master/docs/contributors.html.markdown
+
+-----------------------------
+
+Copyright 2009 Kevin Dangoor
+Copyright 2009 Ihab Awad
+Copyright 2009 Ash Berlin
+Copyright 2009 Aristid Breitkreuz
+Copyright 2009 Kevin Dangoor
+Copyright 2009 Daniel Friesen
+Copyright 2009 Wes Garland
+Copyright 2009 Kris Kowal
+Copyright 2009 Dean Landolt
+Copyright 2009 Peter Michaux
+Copyright 2009 George Moschovitis
+Copyright 2009 Michael O'Brien
+Copyright 2009 Tom Robinson
+Copyright 2009 Hannes Wallnoefer
+Copyright 2009 Mike Wilson
+Copyright 2009 Ondrej Zara
+Copyright 2009 Chris Zumbrunn
+Copyright 2009 Kris Zyp
+
+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.
+
    ====================================================================
 
 // IOS LICENSES 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-coho/blob/6dd248d9/bin/NOTICE
----------------------------------------------------------------------
diff --git a/bin/NOTICE b/bin/NOTICE
index 19c8c29..da628bc 100644
--- a/bin/NOTICE
+++ b/bin/NOTICE
@@ -30,7 +30,8 @@ Ant-Contrib project (http://sourceforge.net/projects/ant-contrib).
    ====================================================================
    
 // WEBOS NOTICES
-
+Modifications to phonegap-core.js (compassAPI) and compass.js (adapted from accelerometer.js)
are
+Copyright 2012 Hewlett-Packard Development Company, L.P.
    ====================================================================
    
 // WP7 NOTICES   


Mime
View raw message