summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorrpj <rpj>1999-03-08 21:02:20 +0000
committerrpj <rpj>1999-03-08 21:02:20 +0000
commit52f7c3f5ef6d9b70ec385fb390bf27962e68ee3d (patch)
tree030c60c1dcddf64c66956490a8b6333e0036a9bd /ChangeLog
parent1e9697f3e8f5da2f710a98d9ae8ce3105e61a4a6 (diff)
Resolve merge conflicts; minor comment changes.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f50d64..ebf4fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,10 @@ Sun Mar 7 12:31:14 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>
(pthread_cond_t): no longer a pointer to pthread_cond_t_.
(pthread_cond_t_): add 'staticinit' and 'valid' elements.
+Sat Mar 6 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>
+
+ * implement.h: Undate comments.
+
Sun Feb 21 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>
* pthread.h (PTHREAD_MUTEX_INITIALIZER): missing braces around