diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-06-21 10:15:36 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-06-21 10:15:36 +0200 |
| commit | 1795c28e175fbdf2a23d8bf0293f95794c7167bd (patch) | |
| tree | 98fc490d8fbfa9eb27d0d21622ccf335ba0f616d | |
| parent | 2ad97a1e8d96a09e794e3e3a80bdc16fb4847cb7 (diff) | |
| download | gcc-1795c28e175fbdf2a23d8bf0293f95794c7167bd.zip gcc-1795c28e175fbdf2a23d8bf0293f95794c7167bd.tar.gz gcc-1795c28e175fbdf2a23d8bf0293f95794c7167bd.tar.bz2 | |
Remove >>>> marker.
From-SVN: r175243
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 235d409..e6c429f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -66,7 +66,6 @@ * regrename.c (do_replace): Don't update notes. ->>>>>>> .r175238 2011-06-20 Alan Modra <amodra@gmail.com> * config/rs6000/rs6000.c (create_TOC_reference): Wrap high part |