summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-04-30 19:05:46 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-04-30 19:05:46 +0000
commite6565799c8582cdb27ab5031f17c78539a6e7125 (patch)
treef777819a1904a697b505e3cf984252b109274be0
parent6e93e838d53791120ce6ad3ef1fe97181f46ddfb (diff)
downloadATCD-e6565799c8582cdb27ab5031f17c78539a6e7125.tar.gz
*** empty log message ***
-rw-r--r--COPYING17
1 files changed, 13 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index fe9796cda5d..b99ab24bac4 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
-Copyright and Licensing Information for ACE and TAO
+Copyright and Licensing Information for ACE(TM) and TAO(TM)
-[1]ACE and [2]TAO are copyrighted by [3]Douglas C. Schmidt and his
-[4]research group at [5]Washington University, Copyright (c)
+[1]ACE(TM) and [2]TAO(TM) are copyrighted by [3]Douglas C. Schmidt and
+his [4]research group at [5]Washington University, Copyright (c)
1993-1999, all rights reserved. Since ACE and TAO are freely
available, [6]open source software, you are free to do anything you
like with the ACE and TAO source code and object code produced from
@@ -48,7 +48,16 @@ incorporation or modification of such submissions is entirely at the
discretion of the moderators of the open source ACE and TAO projects
or their designees.
-If you have any questions, please let [13]me know.
+The names ACE(TM), TAO(TM), and Washington University may not be used
+to endorse or promote products or services derived from this source
+without express written permission from Washington University.
+Further, products or services derived from this source may not be
+called ACE(TM) or TAO(TM), nor may the name Washington University
+appear in their names, without express written permission from
+Washington University.
+
+If you have any suggestions, additions, comments, or questions, please
+let [13]me know.
[14]Douglas C. Schmidt
_________________________________________________________________