You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/05/30 15:58:58 UTC
[1/2] git commit: changes to notice files
Updated Branches:
refs/heads/build/wicket-1.5.7 [created] 92a67b176
changes to notice files
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/92a67b17
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/92a67b17
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/92a67b17
Branch: refs/heads/build/wicket-1.5.7
Commit: 92a67b176b0e62e8bc22853ba096e14b5a2a25c6
Parents: 9cca908
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 30 16:42:14 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 30 16:42:14 2012 +0300
----------------------------------------------------------------------
NOTICE | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/92a67b17/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 61a0b9b..06c287a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,21 +12,27 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUTIONS TO THIS FILE, BUT IN THE
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket-guice
+src/./wicket-datetime
---------------------------------------------------------------------------
- Apache Wicket
- Copyright 2006-2012 Apache Software Foundation
+ Apache Wicket Date Time
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+ Contains code of the Yahoo User Interface library (version: 2.8.2r1),
+ released under the BSD License:
+ http://developer.yahoo.net/yui/license.txt
+ Copyright (c) 2010, Yahoo! Inc.
- This product includes Guice, developed at Google, and licensed
- under the Apache License 2.0. (http://code.google.com/p/google-guice/).
+ This product includes software developed by
+ Joda.org (http://www.joda.org/).
+
---------------------------------------------------------------------------
src/./wicket-examples
---------------------------------------------------------------------------
Apache Wicket Examples
- Copyright 2006-2012 Apache Software Foundation
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -66,10 +72,21 @@ src/./wicket-examples
which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
+src/./wicket-guice
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2006-2011 Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes Guice, developed at Google, and licensed
+ under the Apache License 2.0. (http://code.google.com/p/google-guice/).
+---------------------------------------------------------------------------
src/./wicket-core
---------------------------------------------------------------------------
Apache Wicket
- Copyright 2006-2012 Apache Software Foundation
+ Copyright 2006-2011 Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -100,20 +117,3 @@ src/./wicket-core
'neal'"
[1]: http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
----------------------------------------------------------------------------
-src/./wicket-datetime
----------------------------------------------------------------------------
- Apache Wicket Date Time
- Copyright 2006-2012 Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Contains code of the Yahoo User Interface library (version: 2.8.2r1),
- released under the BSD License:
- http://developer.yahoo.net/yui/license.txt
- Copyright (c) 2010, Yahoo! Inc.
-
- This product includes software developed by
- Joda.org (http://www.joda.org/).
-