diff options
| author | Richard Kenner <kenner@gcc.gnu.org> | 2000-05-03 20:38:04 -0400 |
|---|---|---|
| committer | Richard Kenner <kenner@gcc.gnu.org> | 2000-05-03 20:38:04 -0400 |
| commit | 15f5aab6f88ad35569749aec5186a5fc873b9b9d (patch) | |
| tree | 6d44b9ab5831d32de5ea47e89c14a6f56fbb1fcc /gcc | |
| parent | 1c12c17951fa3ae41b6292643f6db67fa82d668f (diff) | |
| download | gcc-15f5aab6f88ad35569749aec5186a5fc873b9b9d.zip gcc-15f5aab6f88ad35569749aec5186a5fc873b9b9d.tar.gz gcc-15f5aab6f88ad35569749aec5186a5fc873b9b9d.tar.bz2 | |
Remove conflict indicator
From-SVN: r33652
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fd3622c9..78035c1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -52,7 +52,6 @@ Wed May 3 12:55:46 2000 Jim Wilson <wilson@cygnus.com> (DECL_POINTER_DEPTH): Add macro. (tree_decl): Add pointer_depth member. ->>>>>>> 1.6472 Wed May 3 22:52:53 2000 Denis Chertykov <denisc@overta.ru> * config/avr/avr-protos.h (test_hard_reg_class): Declared. |