summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-02-14 22:17:07 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-02-14 22:17:07 +0000
commitaaf019798be8f763022eaeace8ec0239d6fca2be (patch)
treecb84a38ae74ae20c97bc4af28494417bfbe597a1
parent6a2b781253393b4e9e80a21b4fad3838f26c2836 (diff)
downloadATCD-aaf019798be8f763022eaeace8ec0239d6fca2be.tar.gz
ChangeLogTag: Thu Feb 14 16:15:50 2002 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--COPYING2
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLogs/ChangeLog-02a7
-rw-r--r--ChangeLogs/ChangeLog-03a7
4 files changed, 19 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index e221abb7b63..a867182867d 100644
--- a/COPYING
+++ b/COPYING
@@ -5,7 +5,7 @@
[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-2001, all rights reserved. Since ACE and TAO are [6]open source,
+ 1993-2002, all rights reserved. Since ACE and TAO are [6]open source,
[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
diff --git a/ChangeLog b/ChangeLog
index 3b28ec23b78..835c5db73ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb 14 16:15:50 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * COPYING: Updated copyright years.
+
Thu Feb 14 11:25:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* ACEXML/docs/bugs.txt:
@@ -106,9 +110,10 @@ Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>
Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the
suggestion.
+>>>>>>> 4.3173
Wed Feb 13 17:42:32 2002 Balachandran Natarajan <bala@cs.wustl.edu>
- * ace/Configuration.cpp (operator=): Fixed a warning in g+
+ * ace/Configuration.cpp (operator=): Fixed a warning in g++
builds. Stupid mistake on my part :(.
Wed Feb 13 12:45:06 2002 Balachandran Natarajan <bala@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 3b28ec23b78..835c5db73ca 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,7 @@
+Thu Feb 14 16:15:50 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * COPYING: Updated copyright years.
+
Thu Feb 14 11:25:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* ACEXML/docs/bugs.txt:
@@ -106,9 +110,10 @@ Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>
Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the
suggestion.
+>>>>>>> 4.3173
Wed Feb 13 17:42:32 2002 Balachandran Natarajan <bala@cs.wustl.edu>
- * ace/Configuration.cpp (operator=): Fixed a warning in g+
+ * ace/Configuration.cpp (operator=): Fixed a warning in g++
builds. Stupid mistake on my part :(.
Wed Feb 13 12:45:06 2002 Balachandran Natarajan <bala@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3b28ec23b78..835c5db73ca 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,7 @@
+Thu Feb 14 16:15:50 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * COPYING: Updated copyright years.
+
Thu Feb 14 11:25:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* ACEXML/docs/bugs.txt:
@@ -106,9 +110,10 @@ Thu Feb 14 00:20:39 2002 Nanbor Wang <nanbor@cs.wustl.edu>
Thanks to Johnny Tucker <jtucker@magisnetworks.com> for the
suggestion.
+>>>>>>> 4.3173
Wed Feb 13 17:42:32 2002 Balachandran Natarajan <bala@cs.wustl.edu>
- * ace/Configuration.cpp (operator=): Fixed a warning in g+
+ * ace/Configuration.cpp (operator=): Fixed a warning in g++
builds. Stupid mistake on my part :(.
Wed Feb 13 12:45:06 2002 Balachandran Natarajan <bala@cs.wustl.edu>