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



commit 6c8fd1adb05863a4f061fc824abd2cc575b06c2a
Merge: b805125 f06f5f4
Author: Stephane Delcroix <stephane delcroix org>
Date:   Tue Jan 5 12:18:17 2010 +0100

    Merge branch 'FSPOT_0_6_0_STABLE'

 configure.ac                      |    2 +-
 src/Cms/IccProfileClass.cs        |   21 +++++++++++++++++++++
 src/Cms/NativeMethods.cs          |    5 ++++-
 src/Cms/Profile.cs                |   19 +++++++++++--------
 src/Makefile.am                   |    1 +
 src/UI.Dialog/PreferenceDialog.cs |   24 +++++++++++++++++-------
 6 files changed, 55 insertions(+), 17 deletions(-)
---



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