From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6059 invoked by alias); 5 Feb 2008 22:55:12 -0000 Received: (qmail 6047 invoked by uid 22791); 5 Feb 2008 22:55:10 -0000 X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (83.160.170.119) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 05 Feb 2008 22:54:39 +0000 Received: from dijkstra.wildebeest.org ([192.168.1.29]) by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1JMWgW-000587-7L for frysk@sourceware.org; Tue, 05 Feb 2008 23:54:36 +0100 Subject: Re: Merged new upstream libunwind code From: Mark Wielaard To: frysk@sourceware.org In-Reply-To: <1202250563.19234.20.camel@dijkstra.wildebeest.org> References: <1202250563.19234.20.camel@dijkstra.wildebeest.org> Content-Type: text/plain Date: Tue, 05 Feb 2008 22:55:00 -0000 Message-Id: <1202252076.19234.23.camel@dijkstra.wildebeest.org> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-1.fc8) Content-Transfer-Encoding: 7bit X-Spam-Score: -4.4 (----) X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00054.txt.bz2 O, and I updated "How do I update a third party package in frysk-imports?" at http://sourceware.org/frysk/build/ Might be useful for those that still struggle with git from time to time doing these kind of merging.