diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-25 05:00:09 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-25 05:00:09 +0000 |
| commit | e1c6ad0586ba5037141d6bc5326119ca29f1cfc3 (patch) | |
| tree | ad0d4b43e107704eac966583e6b9aac3a37d7277 | |
| parent | 44a0bc49142b76ec1a5a1472caaf786eddd1670d (diff) | |
| download | ATCD-e1c6ad0586ba5037141d6bc5326119ca29f1cfc3.tar.gz | |
ChangeLogTag: Wed Aug 24 21:57:37 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 4 | ||||
| -rw-r--r-- | TAO/configure.ac | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bc7759108c3..d81d4539893 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,7 @@ +Wed Aug 24 21:57:37 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: Copied in updated copyright paragraph from COPYING. + Wed Aug 24 18:12:16 2005 Simon McQueen <sm@prismtech.com> * TAO_IDL/util/utl_global.cpp: diff --git a/TAO/configure.ac b/TAO/configure.ac index 563c7e7b7ef..b4be07dcead 100644 --- a/TAO/configure.ac +++ b/TAO/configure.ac @@ -21,13 +21,17 @@ AC_INIT([TAO], AC_REVISION([$Id$]) -AC_COPYRIGHT([ACE(TM) and TAO(TM) are copyrighted by Douglas C. Schmidt and -his research group at Washington University, University of California, -Irvine, and Vanderbilt University Copyright (c) 1993-2004, all rights -reserved. Since ACE and TAO are open-source, 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. +AC_COPYRIGHT([ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) (henceforth +referred to as "DOC software") are copyrighted by Douglas C. +Schmidt and his research group at Washington University, +University of California, Irvine, and Vanderbilt University, +Copyright (c) 1993-2005, all rights reserved. Since DOC software is +open-source, free software, you are free to use, modify, copy, and +distribute--perpetually and irrevocably--the DOC software source code +and object code produced from the source, as well as copy and +distribute modified versions of this software. You must, however, +include this copyright statement along with code built using DOC +software. Please see the file `COPYING' in the top level ACE directory for additional details.]) |