diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-12-24 17:48:33 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-12-24 17:48:33 +0000 |
| commit | 4430270d6365b6eb0bc4e83277be1f4e5f9b7237 (patch) | |
| tree | 590e9c47edfc659737fc5a285097b3b5c74013ab | |
| parent | b461b55240aa2591593e740788d3cb47311cc917 (diff) | |
| download | ATCD-4430270d6365b6eb0bc4e83277be1f4e5f9b7237.tar.gz | |
just to remove a CVS merge conflict warning
| -rw-r--r-- | ChangeLog-96b | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b index 6628cdc428a..f83132db637 100644 --- a/ChangeLog-96b +++ b/ChangeLog-96b @@ -5,12 +5,6 @@ Tue Dec 24 10:55:20 1996 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> that more picky compilers like GCC won't complain. Thanks to Sandro Doro <alex@aureus.sublink.org> for reporting this. -Sun Dec 22 21:16:23 1996 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu> - - * ace/OS.cpp (thr_create): added a new ACE_HAS_PTHREADS_XAVIER to - deal with the sparam.sched_priority features of the Linux - pthreads implementation. Thanks to James Johnson for this. - Sun Dec 22 21:23:57 1996 David L. Levine <levine@cs.wustl.edu> * ace/Acceptor.cpp: replaced two statements that looked like this: @@ -30,7 +24,6 @@ Sun Dec 22 21:16:23 1996 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu> * ace/OS.cpp (thr_create): added a new ACE_HAS_PTHREADS_XAVIER to deal with the sparam.sched_priority features of the Linux pthreads implementation. Thanks to James Johnson for this. ->>>>>>> 4.124 * ace/OS.i (thr_setprio): I forgot to define int policy = 0; |