[f-spot: 2/2] Merge branch 'FSPOT_0_6_0_STABLE'

From: Ruben Vermeersch <rubenv src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [f-spot: 2/2] Merge branch 'FSPOT_0_6_0_STABLE'
Date: Tue, 25 Aug 2009 21:09:29 +0000 (UTC)

commit c0eae42f4401154e8e2aa19184067ae1f480c6cf
Merge: 05b0a24... 5800319...
Author: Ruben Vermeersch <ruben savanne be>
Date:   Tue Aug 25 23:09:10 2009 +0200

    Merge branch 'FSPOT_0_6_0_STABLE'
    
    Conflicts:
    	extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs

 extensions/Tools/DevelopInUFraw/DevelopInUFRaw.cs |   23 ++++++++------------
 1 files changed, 9 insertions(+), 14 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]