summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-05-23 00:19:27 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-05-23 00:19:27 +0000
commit534591e6ecc364b7c405933f54ae88bafec22b2c (patch)
tree0193437074cf60ce9f3e2c2e50dcadfa44bc3aa3
parent44d2c8a3797d32a2cf7590a5c82268f95d399b89 (diff)
downloadATCD-534591e6ecc364b7c405933f54ae88bafec22b2c.tar.gz
ChangeLogTag: Fri May 23 00:18:24 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ACE/ChangeLog9
-rw-r--r--ACE/ace/Makefile.am2
2 files changed, 10 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index eb6a211b383..4152509c62b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,12 @@
+Fri May 23 00:18:24 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ace/Makefile.am:
+
+ Rename MonitorControl subdirectory to Monitor_Control, to
+ adapt to this change:
+
+ Wed May 21 19:01:10 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
+
Thu May 22 23:04:38 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am
index 5d0e6d5e6c8..04150d4edb5 100644
--- a/ACE/ace/Makefile.am
+++ b/ACE/ace/Makefile.am
@@ -17,7 +17,7 @@ ACE_ROOT = $(top_srcdir)
SUBDIRS = \
. \
ETCL \
- MonitorControl \
+ Monitor_Control \
SSL
CLEANFILES =