From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5160 invoked by alias); 12 Feb 2009 19:22:23 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 5135 invoked by uid 9674); 12 Feb 2009 19:22:23 -0000 Date: Thu, 12 Feb 2009 19:22:00 -0000 Message-ID: <20090212192223.5120.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-rmoseley-fedora-merge: Remove GIT conflict merge marker. X-Git-Refname: refs/heads/archer-rmoseley-fedora-merge X-Git-Reftype: branch X-Git-Oldrev: 5925b7e53bd877feb9fdc0ed524604f819c20862 X-Git-Newrev: 6cf87f9e59653ab1717feadd6ebbf88335e9659c X-SW-Source: 2009-q1/txt/msg00149.txt.bz2 List-Id: 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 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.