projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe9b495
)
Remove conflict marker.
author
Mark Mitchell
<mmitchel@gcc.gnu.org>
Tue, 23 Mar 1999 08:38:04 +0000
(08:38 +0000)
committer
Mark Mitchell
<mmitchel@gcc.gnu.org>
Tue, 23 Mar 1999 08:38:04 +0000
(08:38 +0000)
From-SVN: r25923
gcc/cp/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/cp/ChangeLog
b/gcc/cp/ChangeLog
index 3b9dd255c9f7de9b06070d36b7c0d03c6738d814..e189f6db7b23526a08ace142b36931e21829bc83 100644
(file)
--- a/
gcc/cp/ChangeLog
+++ b/
gcc/cp/ChangeLog
@@
-65,7
+65,6
@@
* decl.c (start_function): Suppress normal linkage heuristics
for #pragma interface under MULTIPLE_SYMBOL_SPACES.
->>>>>>> 1.947
1999-03-19 Alexandre Oliva <oliva@dcc.unicamp.br>
* Make-lang.in: ($(INTL_TARGETS)): depend on cp/parse.c