diff options
| author | Kenneth Zadeck <zadeck@naturalbridge.com> | 2008-01-14 13:51:24 +0000 |
|---|---|---|
| committer | Kenneth Zadeck <zadeck@naturalbridge.com> | 2008-01-14 13:51:24 +0000 |
| commit | 1644647a66394a497432d002ab7d644455e81634 (patch) | |
| tree | fdd61992828e20da69abf48e115836ee0c341ef0 | |
| parent | 0670ccd1bde3fa9332e549236cbcfefc60ffd951 (diff) | |
forgot to save back changelog.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/lto@131527 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog.lto | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gcc/ChangeLog.lto b/gcc/ChangeLog.lto index f06ecb4a5dc..ac4d520350f 100644 --- a/gcc/ChangeLog.lto +++ b/gcc/ChangeLog.lto @@ -1,4 +1,3 @@ -<<<<<<< .mine 2008-01-14 Kenneth Zadeck <zadeck@naturalbridge.com> * lto-function-out (lto_debug_context, output_stream, LTO_SET_DEBUGGING_STREAM): Moved to lto_section_out.h. @@ -30,7 +29,6 @@ lto-section-out.c. * Makefile.in (lto-section-out.o): New rule. -======= 2008-01-07 Diego Novillo <dnovillo@google.com> http://gcc.gnu.org/ml/gcc-patches/2008-01/msg00263.html @@ -38,7 +36,6 @@ * dwarf2out.c (force_decl_die): Initialize SAVED_IGNORED_FLAG. * dwarf2.h (enum dwarf_type): Remove trailing comma. ->>>>>>> .r131525 2007-12-29 Nathan Froyd <froydnj@codesourcery.com> * collect2.c (scan_prog_file): Read all the output when reading |