diff options
| author | David Edelsohn <dje@gcc.gnu.org> | 2013-05-21 19:08:28 -0400 |
|---|---|---|
| committer | David Edelsohn <dje@gcc.gnu.org> | 2013-05-21 19:08:28 -0400 |
| commit | b0f6005b1ea2a1f2f4d4e534d8e1f7f1c7c09969 (patch) | |
| tree | 2482f37dc4f3e2694ce23ef8caef09cc54c953a9 /gcc | |
| parent | 4cbc4bd7ad2977328c354a7088852281a8635c23 (diff) | |
| download | gcc-b0f6005b1ea2a1f2f4d4e534d8e1f7f1c7c09969.zip gcc-b0f6005b1ea2a1f2f4d4e534d8e1f7f1c7c09969.tar.gz gcc-b0f6005b1ea2a1f2f4d4e534d8e1f7f1c7c09969.tar.bz2 | |
- Remove SVN merge marker.
From-SVN: r199167
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 0dcb69c..c43d820 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -52,7 +52,6 @@ * config/sh/sh.md (fmasf4): Remove empty constraints strings. (*fmasf4, *fmasf4_media): New insns. ->>>>>>> .r199151 2013-05-19 Richard Sandiford <rdsandiford@googlemail.com> * config/mips/mips.h (BASE_INSN_LENGTH, NOP_INSN_LENGTH): New macros. |