projects / platform / upstream / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4de5c5d)
Remove ">>>>>>> .r123627".
authorH.J. Lu <hjl@gcc.gnu.org>
Fri, 6 Apr 2007 21:24:17 +0000 (14:24 -0700)
committerH.J. Lu <hjl@gcc.gnu.org>
Fri, 6 Apr 2007 21:24:17 +0000 (14:24 -0700)
From-SVN: r123629

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eca498c..d5f8559 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -23,7 +23,6 @@
        mode macro.
        (*truncxf?f_i387 splitter): Ditto.
 
->>>>>>> .r123627
 2007-04-06  Daniel Berlin  <dberlin@dberlin.org>
 
        * langhooks-def.h (LANG_HOOKS_INITIALIZER): Remove
Domain: System / Toolchain;