[gnome-color-manager: 10/18] trivial: merge in an experimental branch

[Richard Hughes <rhughes src gnome org>]

commit 09cb01c92592595a6597f3d7d02cc72a0d910bec
Merge: d3ab7ba 80599ce
Author: Richard Hughes <richard hughsie com>
Date:   Fri Oct 8 12:51:27 2010 +0100

    trivial: merge in an experimental branch

 docs/api/libcolor-glib-docs.sgml |    1 -
 docs/huey/gcm-calculate-fudge.c  |   20 ++--
 libcolor-glib/Makefile.am        |    2 -
 libcolor-glib/gcm-color.c        |  137 +++++++++++++++++++-
 libcolor-glib/gcm-color.h        |   28 ++++-
 libcolor-glib/gcm-edid.c         |  155 +++++++++++++++++++++--
 libcolor-glib/gcm-edid.h         |    6 +
 libcolor-glib/gcm-profile.c      |  260 ++++++++++++++++++++++++--------------
 libcolor-glib/gcm-profile.h      |   12 ++-
 libcolor-glib/gcm-self-test.c    |   50 ++++----
 libcolor-glib/gcm-xyz.c          |  229 ---------------------------------
 libcolor-glib/gcm-xyz.h          |   72 -----------
 src/cc-color-panel.c             |    6 +-
 src/gcm-calibrate-argyll.c       |    8 +-
 src/gcm-calibrate.c              |   35 ++++--
 src/gcm-cell-renderer-profile.c  |   26 ++--
 src/gcm-cie-widget.c             |  157 ++++++++++++++---------
 src/gcm-cie-widget.h             |    3 +
 src/gcm-device-xrandr.c          |   49 +++++++
 src/gcm-device.c                 |   22 ++++
 src/gcm-device.h                 |    8 ++
 src/gcm-import.c                 |   35 +-----
 src/gcm-picker.c                 |    6 +-
 src/gcm-self-test.c              |   71 +++++++++--
 src/gcm-viewer.c                 |   34 +-----
 25 files changed, 802 insertions(+), 630 deletions(-)
---