projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97dc9fc
)
* Remove overlooked conflict marker.
author
Gerald Pfeifer
<gerald@gcc.gnu.org>
Thu, 9 Nov 2000 08:48:30 +0000
(08:48 +0000)
committer
Gerald Pfeifer
<gerald@gcc.gnu.org>
Thu, 9 Nov 2000 08:48:30 +0000
(08:48 +0000)
From-SVN: r37337
gcc/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/ChangeLog
b/gcc/ChangeLog
index 3c6f2dfcb8e5102a013456fdcc2b7796184e973e..5f1bd775139d95768d280d7387b107452c055343 100644
(file)
--- a/
gcc/ChangeLog
+++ b/
gcc/ChangeLog
@@
-83,7
+83,6
@@
Wed Nov 8 21:53:41 MET 2000 Jan Hubicka <jh@suse.cz>
* expr.c (expand_expr) [ADDR_EXPR]: Handle when op0 is RETURN_DECL
passed in multiple non-contiguous locations.
->>>>>>> 1.8198
2000-11-08 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
* README.gnat: Remove file.