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

From: Ruben Vermeersch <rubenv src gnome org>
To: commits-list gnome org
Cc:
Subject: [f-spot: 2/2] Merge branch 'FSPOT_0_6_0_STABLE'
Date: Sat, 27 Mar 2010 17:54:00 +0000 (UTC)

commit 98fc10c7fdf98df9e3987c20de38a99281e66a34
Merge: 12946a3 e7c878b
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat Mar 27 18:53:35 2010 +0100

    Merge branch 'FSPOT_0_6_0_STABLE'

 extensions/Tools/Makefile.am                       |    1 +
 .../Tools/RetroactiveRoll/RetroactiveRoll.cs       |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --cc extensions/Tools/Makefile.am
index 778f491,7cd8c1d..0becd70
--- a/extensions/Tools/Makefile.am
+++ b/extensions/Tools/Makefile.am
@@@ -2,7 -2,7 +2,8 @@@ SUBDIRS = 			
  	ChangePhotoPath		\
  	DevelopInUFraw		\
  	HashJob			\
 +	LiveWebGallery		\
  	MergeDb			\
  	RawPlusJpeg		\
+ 	RetroactiveRoll		\
  	ScreensaverConfig

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