diff options
| author | H.J. Lu <hjl@gcc.gnu.org> | 2007-04-06 14:24:17 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2007-04-06 14:24:17 -0700 |
| commit | 64199a9eedbd34833b7712d6da13d117fa3ef9f4 (patch) | |
| tree | 216471f69b8e9f974421770065bcd4a91b821972 /gcc | |
| parent | 4de5c5d3bf98f4fa827ecc4fd07d49e77761e43a (diff) | |
| download | gcc-64199a9eedbd34833b7712d6da13d117fa3ef9f4.zip gcc-64199a9eedbd34833b7712d6da13d117fa3ef9f4.tar.gz gcc-64199a9eedbd34833b7712d6da13d117fa3ef9f4.tar.bz2 | |
Remove ">>>>>>> .r123627".
From-SVN: r123629
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 eca498c..d5f8559 100644 --- 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 |