projects
/
platform
/
upstream
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
df8fa70
)
Remove conflict marker.
author
Andreas Schwab
<schwab@gcc.gnu.org>
Fri, 1 Aug 2008 13:14:39 +0000
(13:14 +0000)
committer
Andreas Schwab
<schwab@gcc.gnu.org>
Fri, 1 Aug 2008 13:14:39 +0000
(13:14 +0000)
From-SVN: r138516
gcc/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/ChangeLog
b/gcc/ChangeLog
index
dc1c260
..
42c6c42
100644
(file)
--- a/
gcc/ChangeLog
+++ b/
gcc/ChangeLog
@@
-96,7
+96,6
@@
(dwarf2out_stack_adjust): Use it.
(dwarf2out_frame_debug_expr): Likewise.
->>>>>>> .r138449
2008-07-31 Richard Guenther <rguenther@suse.de>
PR tree-optimization/36978