diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-04-27 00:45:13 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@cygnus.com> | 2000-04-27 00:45:13 +0000 |
| commit | cb977d705fd63c66f1e08394ee23f6e59a4cb2d9 (patch) | |
| tree | 5e4984d5c1c4c2059652c2f6f9336c6a7e7b08ef /boehm-gc | |
| parent | 1c915973113ec2e28383900fbe47c768981126ec (diff) | |
Fixed ChangeLog merge snafu
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@33453 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index c2aa9270829..fd02f6ac40d 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< ChangeLog 2000-04-26 Jakub Jelinek <jakub@redhat.com> * gcconfig.h (SPARC): Define ALIGNMENT to 8 for 64bit SPARC. |