summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING8
-rw-r--r--ChangeLog-99b6
2 files changed, 10 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index f0b051a2b30..a8f89534e82 100644
--- a/COPYING
+++ b/COPYING
@@ -6,16 +6,16 @@
[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 [6]open source,
- [7]free software, you are free to do anything you like with the ACE
+ [7]free software, you are free to use, modify, and distribute the ACE
and TAO source code and object code produced from the source, as long
as you include this copyright statement along with code built using
ACE and TAO.
In particular, you can use ACE and TAO in proprietary software and are
under no obligation to redistribute any of your source code that is
- built using ACE and TAO. Please note, however, that you may not do
- anything to the ACE and TAO code, such as copyrighting it yourself or
- claiming authorship of the ACE and TAO code, that will prevent it from
+ built using ACE and TAO. Note, however, that you may not do anything
+ to the ACE and TAO code, such as copyrighting it yourself or claiming
+ authorship of the ACE and TAO code, that will prevent ACE and TAO from
being distributed freely using an open source development model.
ACE and TAO are provided as is with no warranties of any kind,
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 610836de54f..711189507de 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,9 @@
+Wed May 12 12:14:09 1999 Ossama Othman <othman@cs.wustl.edu>
+
+ * COPYING:
+
+ Additional updates/clarifications suggested by Richard Stallman.
+
Wed May 12 00:25:57 1999 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/Thread_Manager.h (ACE_Thread_Manager): Added clarification