summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-12-09 16:37:58 +0000
committerMatthias Radestock <matthias@lshift.net>2008-12-09 16:37:58 +0000
commitb52ea7468170797edbb0ded22333fa20f915e8a4 (patch)
treeef4eb7ca193d4c261f4c7530f3dd5d43f339dedd
parent77649569e1cd2ef47167f3bcba968981aaed268d (diff)
parent7889003b717aee452f734c18f2539baf6a5dc7de (diff)
downloadrabbitmq-codegen-b52ea7468170797edbb0ded22333fa20f915e8a4.tar.gz
merge bug19974 into default
-rw-r--r--LICENSE-MPL-RabbitMQ20
-rw-r--r--amqp_codegen.py18
2 files changed, 25 insertions, 13 deletions
diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ
index 7c2ee3c..2d0a7b1 100644
--- a/LICENSE-MPL-RabbitMQ
+++ b/LICENSE-MPL-RabbitMQ
@@ -446,13 +446,19 @@ EXHIBIT A -Mozilla Public License.
The Original Code is RabbitMQ.
- The Initial Developers of the Original Code are LShift Ltd.,
- Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
-
- Portions created by LShift Ltd., Cohesive Financial Technologies
- LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
- LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
- Technologies Ltd.;
+ The Initial Developers of the Original Code are LShift Ltd,
+ Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+
+ Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+ Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+ are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+ Technologies LLC, and Rabbit Technologies Ltd.
+
+ Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+ Ltd. Portions created by Cohesive Financial Technologies LLC are
+ Copyright (C) 2007-2009 Cohesive Financial Technologies
+ LLC. Portions created by Rabbit Technologies Ltd are Copyright
+ (C) 2007-2009 Rabbit Technologies Ltd.
All Rights Reserved.
diff --git a/amqp_codegen.py b/amqp_codegen.py
index c4a3846..63a69b7 100644
--- a/amqp_codegen.py
+++ b/amqp_codegen.py
@@ -10,13 +10,19 @@
##
## The Original Code is RabbitMQ.
##
-## The Initial Developers of the Original Code are LShift Ltd.,
-## Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+## The Initial Developers of the Original Code are LShift Ltd,
+## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
##
-## Portions created by LShift Ltd., Cohesive Financial Technologies
-## LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
-## LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
-## Technologies Ltd.;
+## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+## Technologies LLC, and Rabbit Technologies Ltd.
+##
+## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+## Ltd. Portions created by Cohesive Financial Technologies LLC are
+## Copyright (C) 2007-2009 Cohesive Financial Technologies
+## LLC. Portions created by Rabbit Technologies Ltd are Copyright
+## (C) 2007-2009 Rabbit Technologies Ltd.
##
## All Rights Reserved.
##