diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 17:26:47 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-18 17:26:47 +0000 |
| commit | 940be616fb3a5a3ff6679a99465df80b1d2ed391 (patch) | |
| tree | cfec7184e75ce24ef6a57eabc5ee3f001c7e7310 /ChangeLog | |
| parent | a0df2e92eb62ab4bc7b3a1218721f6d9eb491a4b (diff) | |
| download | ATCD-940be616fb3a5a3ff6679a99465df80b1d2ed391.tar.gz | |
Forgot to remove one changelog indicator
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f552819c8fd..4b24b0c5ccc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -314,7 +314,6 @@ Mon May 15 15:14:41 2000 Carlos O'Ryan <coryan@uci.edu> The changes were tested using PA-RISC, Alphas, Sparcs and finally Pentiums in various forms and using several compilers. ->>>>>>> 4.507 Mon May 15 14:01:23 2000 Ossama Othman <ossama@uci.edu> * ace/OS.h: |