[f-spot: 2/2] Merge branch 'FSPOT_0_6_0_STABLE'
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [f-spot: 2/2] Merge branch 'FSPOT_0_6_0_STABLE'
- Date: Tue, 15 Sep 2009 12:48:05 +0000 (UTC)
commit e3d07dd046f15c3d974d636f118062b4b01cf826
Merge: 2d29953... faa376f...
Author: Stephane Delcroix <stephane delcroix org>
Date: Tue Sep 15 14:46:10 2009 +0200
Merge branch 'FSPOT_0_6_0_STABLE'
Conflicts:
extensions/Exporters/TabbloExport/Makefile.am
extensions/Exporters/FlickrExport/Makefile.am | 4 ++--
extensions/Exporters/PicasaWebExport/Makefile.am | 4 ++--
extensions/Exporters/SmugMugExport/Makefile.am | 4 ++--
src/Makefile.am | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]