You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/05/06 21:18:54 UTC
android commit: Revert accidentally removed lines from NOTICE
Repository: cordova-android
Updated Branches:
refs/heads/master c349892c5 -> 8702c04d3
Revert accidentally removed lines from NOTICE
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/8702c04d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/8702c04d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/8702c04d
Branch: refs/heads/master
Commit: 8702c04d392cbd0d9e075705ff497b93ecf147de
Parents: c349892
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue May 6 15:17:49 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue May 6 15:18:31 2014 -0400
----------------------------------------------------------------------
NOTICE | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8702c04d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 8ec56a5..40c5e74 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,17 @@
Apache Cordova
-Copyright 2012 The Apache Software Foundation
+Copyright 2014 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org)
+
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+== in this case for the Android-specific code. ==
+=========================================================================
+
+This product includes software developed as part of
+The Android Open Source Project (http://source.android.com).
+
+This software includes software developed at Square, Inc.
+Copyright (C) 2013 Square, Inc.