diff options
| author | Richard Henderson <rth@gcc.gnu.org> | 1998-08-25 05:24:31 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 1998-08-25 05:24:31 -0700 |
| commit | 8239d6c313265003e2d28bd4b7fdd0b613ce5635 (patch) | |
| tree | f4cd6d44da305089ec5b27ba6c3c09624d648861 /gcc | |
| parent | 91bb873f6a9999799bfc4242b9bd4e13c47bf820 (diff) | |
| download | gcc-8239d6c313265003e2d28bd4b7fdd0b613ce5635.zip gcc-8239d6c313265003e2d28bd4b7fdd0b613ce5635.tar.gz gcc-8239d6c313265003e2d28bd4b7fdd0b613ce5635.tar.bz2 | |
Oops. forgot to kill the >>> from the conflict.
From-SVN: r21969
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 4e1dd65..d5cc797 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -70,7 +70,6 @@ Mon Aug 24 15:20:19 1998 David Edelsohn <edelsohn@mhpcc.edu> (movdf_softfloat32, movdf_hardfloat64, movdf_softfloat64): Change 'o' to 'm' for GPR variant constraints. ->>>>>>> 1.1938 Mon Aug 24 10:25:46 1998 Jeffrey A Law (law@cygnus.com) * loop.c (scan_loop): Honor AVOID_CC_MODE_COPIES. |