projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f5d39c3
)
remove conflict indicators
author
Nathan Sidwell
<nathan@gcc.gnu.org>
Mon, 21 Mar 2005 12:33:15 +0000
(12:33 +0000)
committer
Nathan Sidwell
<nathan@gcc.gnu.org>
Mon, 21 Mar 2005 12:33:15 +0000
(12:33 +0000)
From-SVN: r96790
gcc/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/ChangeLog
b/gcc/ChangeLog
index 2e947eaed20c20a4e450cb2244dac28b7fdc0b6b..e16a3125bee3e0ed421136db805e1272d0680ca5 100644
(file)
--- a/
gcc/ChangeLog
+++ b/
gcc/ChangeLog
@@
-495,7
+495,6
@@
(arc_rodata_string, TARGET_OPTIONS): Delete.
* config/arc/arc.opt: New file.
->>>>>>> 2.7930
2005-03-17 Richard Henderson <rth@redhat.com>
* doc/extend.texi (Weak Pragmas): New section.