public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM] archer-rmoseley-fedora-merge: Remove GIT conflict merge marker.
@ 2009-02-12 19:22 jkratoch
0 siblings, 0 replies; only message in thread
From: jkratoch @ 2009-02-12 19:22 UTC (permalink / raw)
To: archer-commits
The branch, archer-rmoseley-fedora-merge has been updated
via 6cf87f9e59653ab1717feadd6ebbf88335e9659c (commit)
from 5925b7e53bd877feb9fdc0ed524604f819c20862 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 6cf87f9e59653ab1717feadd6ebbf88335e9659c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu Feb 12 20:20:54 2009 +0100
Remove GIT conflict merge marker.
The file looks now most close to the FSF revision 1.62.
-----------------------------------------------------------------------
Summary of changes:
bfd/elf32-spu.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
First 500 lines of diff:
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index d85afa8..0e8d010 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -1346,7 +1346,6 @@ build_stub (struct bfd_link_info *info,
if (ovl == 0)
/* Extra space for linked list entries. */
sec->size += 16;
->>>>>>> 6dea2c97a8617f01b34dc9d04810f31c049f4834:bfd/elf32-spu.c
break;
default:
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-12 19:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-12 19:22 [SCM] archer-rmoseley-fedora-merge: Remove GIT conflict merge marker jkratoch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).