fix conflicts
From-SVN: r49083
This commit is contained in:
parent
2b672c08f3
commit
1b21d6a004
1 changed files with 0 additions and 1 deletions
|
@ -120,7 +120,6 @@ Tue Jan 22 06:26:33 2002 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
|
|||
(sparc-*-netbsd*): Add netbsd-aout.h to tm_file.
|
||||
(vax-*-netbsd*): Add netbsd-aout.h to tm_file.
|
||||
|
||||
>>>>>>> 1.12770
|
||||
2002-01-21 John David Anglin <dave@hiauly1.hia.nrc.ca>
|
||||
|
||||
* pa-protos.h (reg_before_reload_operand): New function prototype.
|
||||
|
|
Loading…
Add table
Reference in a new issue