projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
66804d9
)
remove conflict marker
author
Nathan Sidwell
<nathan@gcc.gnu.org>
Wed, 21 May 2003 11:14:22 +0000
(11:14 +0000)
committer
Nathan Sidwell
<nathan@gcc.gnu.org>
Wed, 21 May 2003 11:14:22 +0000
(11:14 +0000)
From-SVN: r67059
gcc/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/ChangeLog
b/gcc/ChangeLog
index 4dc4a1d0ce9768d29db4160debbe4461d99ea068..2e75ec468acb045935918466994791671ae1d5ee 100644
(file)
--- a/
gcc/ChangeLog
+++ b/
gcc/ChangeLog
@@
-158,7
+158,6
@@
* doc/invoke.texi (Option Summary, PowerPC Options): Document
new options.
->>>>>>> 1.17889
2003-05-19 J"orn Rennecke <joern.rennecke@superh.com>
* c-decl.c (finish_decl): When setting the DECL_ASSEMBLER_NAME