aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 22fb1bd..dd524b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -135,7 +135,6 @@
* cfgloopmanip.c (remove_path): Walk loop hiearchy upwards when
unlooping loops.
->>>>>>> .r182937
2012-01-05 Richard Guenther <rguenther@suse.de>
PR lto/50490