[30/50] [abbrv] qpid-proton git commit: PROTON-885: update the top-level license file

[ac...@apache.org]

PROTON-885: update the top-level license file


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/59afc558
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/59afc558
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/59afc558

Branch: refs/heads/cjansen-cpp-client
Commit: 59afc5588f0203b427f22b4f9486d27af5cdaa9e
Parents: 2e2ba9c
Author: Ken Giusti <kg...@apache.org>
Authored: Fri May 15 17:17:09 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Fri May 15 17:17:09 2015 -0400

----------------------------------------------------------------------
 LICENSE | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/59afc558/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 4956407..6d1be4d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,3 +207,8 @@ PROTON SUBCOMPONENTS:
 Proton includes freegetopt with a separate BSD license.  Your use
 of the source code for freegetopt is subject to the terms and
 conditions of its license in examples/include/pncompat/internal/LICENSE.
+
+The python bindings includes files derived by PyZMQ an are licensed
+with a separate Modified BSD license.  Use of the source code in these
+files are subject to the terms and conditions in the license:
+proton-c/bindings/python/PYZMQ_LICENSE.BSD.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org