From 52f7c3f5ef6d9b70ec385fb390bf27962e68ee3d Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Mon, 8 Mar 1999 21:02:20 +0000
Subject: Resolve merge conflicts; minor comment changes.

---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ChangeLog')

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
-- 
cgit v1.2.3