summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2008-04-16 12:17:34 +0000
committerAidan Skinner <aidan@apache.org>2008-04-16 12:17:34 +0000
commit52d8b7ee7e80a230d2b4eeec3f405a5065a39ef9 (patch)
tree859b70e56f4cd43246e8d90fb99cc24ba158eb5d
parentcdc8f82f0cd09b5afa8e5b9f6bc1d5d02b12cb92 (diff)
downloadqpid-python-52d8b7ee7e80a230d2b4eeec3f405a5065a39ef9.tar.gz
QPID-916 update dotnet NOTICE to include log4net, make sure DISCLAIMER is including in c++
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@648678 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/Makefile.am2
-rw-r--r--dotnet/NOTICE.txt7
2 files changed, 7 insertions, 2 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index ffeec27f97..4cac9427e5 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = 1.9.2 foreign
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
- LICENSE NOTICE README RELEASE_NOTES\
+ LICENSE NOTICE README RELEASE_NOTES DISCLAIMER\
etc/qpidd \
$(PACKAGE).spec \
$(PACKAGE).spec.in
diff --git a/dotnet/NOTICE.txt b/dotnet/NOTICE.txt
index 910974b01c..e6d09393b6 100644
--- a/dotnet/NOTICE.txt
+++ b/dotnet/NOTICE.txt
@@ -23,4 +23,9 @@ This product also includes software developed by:
- The Mentalis Security Library, Copyright © 2002-2006, , The Mentalis.org Team
under tterms based on the BSD license (http://www.mentalis.org/site/license.qpx).
- Available from http://www.mentalis.org/soft/projects/seclib/ \ No newline at end of file
+ Available from http://www.mentalis.org/soft/projects/seclib/
+
+This product includes software, Apache Log4Net (http://logging.apache.org/log4net)
+License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
+
+