mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-02 05:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove conflict marker.

Browse Source 
From-SVN: r25923
This commit is contained in:
Mark Mitchell 1999-03-23 08:38:04 +00:00
parent fe9b4957b5
commit eb30a37534
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/cp/ChangeLog
View File

@ -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