Author: aidan
Date: Thu Sep 4 16:02:20 2008
New Revision: 692295
URL: http://svn.apache.org/viewvc?rev=692295&view=rev
Log:
Merge release related changes from trunk
Added:
incubator/qpid/branches/M3-release/qpid/cpp/DISCLAIMER
- copied unchanged from r692031, incubator/qpid/trunk/qpid/cpp/DISCLAIMER
incubator/qpid/branches/M3-release/qpid/python/DISCLAIMER
- copied unchanged from r692031,
incubator/qpid/trunk/qpid/python/DISCLAIMER
incubator/qpid/branches/M3-release/qpid/ruby/DISCLAIMER
- copied unchanged from r692031, incubator/qpid/trunk/qpid/ruby/DISCLAIMER
Modified:
incubator/qpid/branches/M3-release/qpid/cpp/Makefile.am
Modified: incubator/qpid/branches/M3-release/qpid/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M3-release/qpid/cpp/Makefile.am?rev=692295&r1=692294&r2=692295&view=diff
==============================================================================
--- incubator/qpid/branches/M3-release/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/branches/M3-release/qpid/cpp/Makefile.am Thu Sep 4 16:02:20
2008
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
- LICENSE NOTICE README RELEASE_NOTES DESIGN\
+ LICENSE NOTICE README RELEASE_NOTES DESIGN DISCLAIMER\
xml/cluster.xml
SUBDIRS = managementgen etc src docs/api docs/man examples
