diff options
| author | rpj <rpj> | 1998-07-23 17:12:12 +0000 | 
|---|---|---|
| committer | rpj <rpj> | 1998-07-23 17:12:12 +0000 | 
| commit | 63ed0e78ffb72a9f425928344355c2159830b5af (patch) | |
| tree | 391078160e36b786d62c3505fd2c410607924f79 /Makefile | |
| parent | 5b4731d25e148347d190d8ceb5f3f7aa2a7dac86 (diff) | |
Fri Jul 24 03:00:25 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
	* attr.c (pthread_attr_destroy):  Fix merge conflicts.
	(pthread_attr_getdetachstate):  Fix merge conflicts.
	(pthread_attr_setdetachstate):  Fix merge conflicts.
	* pthread.h:  Fix merge conflicts.
	* sync.c (pthread_join): Fix merge conflicts.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
