projects / platform / upstream / linaro-gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1273a0b)
- Remove SVN merge marker.
authordje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 21 May 2013 23:08:28 +0000 (23:08 +0000)
committerdje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 21 May 2013 23:08:28 +0000 (23:08 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199167 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dcb69c..c43d820 100644 (file)
--- 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.
Domain: System / Toolchain;