projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d40b45
)
Remove conflict indicator.
author
Per Bothner
<bothner@gcc.gnu.org>
Fri, 5 Dec 2003 20:53:30 +0000
(12:53 -0800)
committer
Per Bothner
<bothner@gcc.gnu.org>
Fri, 5 Dec 2003 20:53:30 +0000
(12:53 -0800)
From-SVN: r74345
gcc/ChangeLog
patch
|
blob
|
history
diff --git
a/gcc/ChangeLog
b/gcc/ChangeLog
index eaaff1803e817909bb9c7068acefb17859187119..1cd3f9373b61cfddb3da8b94ee6c86a8dc3e320b 100644
(file)
--- a/
gcc/ChangeLog
+++ b/
gcc/ChangeLog
@@
-104,7
+104,6
@@
PR target/12467
* config/rs6000/altivec.md (altivec_vmsummbm): Fix typo.
->>>>>>> 2.1930
2003-12-04 Stuart Hastings <stuart@apple.com>
* rs6000.c (output_call, macho_branch_islands,