diff options
| author | Richard Henderson <rth@gcc.gnu.org> | 1999-10-14 10:44:07 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 1999-10-14 10:44:07 -0700 |
| commit | 61da3d7039e1a7163ba52d41c786565048a34601 (patch) | |
| tree | 470cd1d9111a6234eeef083b208ba541d4ab3956 /gcc | |
| parent | c1361791ef590dd32aaff5c6d4c6561fb6e94cfb (diff) | |
| download | gcc-61da3d7039e1a7163ba52d41c786565048a34601.zip gcc-61da3d7039e1a7163ba52d41c786565048a34601.tar.gz gcc-61da3d7039e1a7163ba52d41c786565048a34601.tar.bz2 | |
Remove cvs conflict markers.
From-SVN: r29983
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6179ff0..2f628f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -10,7 +10,6 @@ Wed Oct 13 00:09:18 1999 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * libgcc2.c (__do_global_dtors): Protect __deregister_frame_info from multiple calls. ->>>>>>> 1.4674 Thu Oct 14 04:54:54 1999 Richard Henderson <rth@cygnus.com> * i386.md (call value patterns): Move to the end of the file. @@ -267,7 +266,6 @@ Wed Oct 13 10:07:54 1999 Richard Henderson <rth@cygnus.com> (struct rtvec_def): Likewise. * tree.h (struct tree_common): Likewise. ->>>>>>> 1.4673 Wed Oct 13 01:44:29 1999 Carol LePage <carolo@hal.com> * configure.in (sparc-hal-solaris2*): Fix xm_file, xm_defines, @@ -314,7 +312,6 @@ Tue Oct 12 07:38:41 1999 Bruce Korb <autogen@linuxbox.com> * fixincl/fixlib.h: protect against doubly defining t_bool * fixincl/server.h: protect against doubly defining t_bool ->>>>>>> 1.4648 Mon Oct 11 20:18:41 1999 Jim Wilson <wilson@cygnus.com> * genoutput.c: Include toplev.h. |