projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
486772b
)
Remove the residuals of a previous merge conflict.
author
Wolfgang Bangerth
<bangerth@gcc.gnu.org>
Thu, 15 May 2003 15:02:27 +0000
(09:02 -0600)
committer
Wolfgang Bangerth
<bangerth@gcc.gnu.org>
Thu, 15 May 2003 15:02:27 +0000
(09:02 -0600)
From-SVN: r66826
gcc/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/ChangeLog
b/gcc/ChangeLog
index 4ffd196eb7669c1cfbe5dc41c4f06a61b7fdc852..5d4be0bc64c4b3b47780fad2a915971c822722f6 100644
(file)
--- a/
gcc/ChangeLog
+++ b/
gcc/ChangeLog
@@
-587,7
+587,6
@@
Mon May 12 11:32:53 CEST 2003 Jan Hubicka <jh@suse.cz>
(s390_function_arg): Likewise.
(s390_va_arg): Likewise
->>>>>>> 1.17806
2003-05-11 Nathan Sidwell <nathan@codesourcery.com>
* coverage.h (coverage_counter_alloc): New function.