Commit b0f6005b by David Edelsohn

- Remove SVN merge marker.

From-SVN: r199167
parent 4cbc4bd7
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment