summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2008-08-29 15:28:25 +0000
committerMartin Ritchie <ritchiem@apache.org>2008-08-29 15:28:25 +0000
commit8c644aa7a0919ae108f72f3c55f036100e287d83 (patch)
tree01466d67776a78189b84bb3d98f5b363026c5199 /cpp
parenta1bbe990ef392d1df49edaa0d6bc85bab8eaad05 (diff)
downloadqpid-python-8c644aa7a0919ae108f72f3c55f036100e287d83.tar.gz
Updated License and Notice in Java, added missing L & N files to directories and added release.sh to our bin directory
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@690300 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/LICENSE31
1 files changed, 31 insertions, 0 deletions
diff --git a/cpp/LICENSE b/cpp/LICENSE
index 6b0b1270ff..cff2a5e25d 100644
--- a/cpp/LICENSE
+++ b/cpp/LICENSE
@@ -1,3 +1,6 @@
+=========================================================================
+== Apache License ==
+=========================================================================
Apache License
Version 2.0, January 2004
@@ -201,3 +204,31 @@
See the License for the specific language governing permissions and
limitations under the License.
+=========================================================================
+== Boost License ==
+=========================================================================
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+