01/01: Merge branch 'wip-glib' into master.

[Andreas Enge]

andreas pushed a commit to branch master
in repository guix.

commit 003e8d5e04d4296a18a651bf2183335db87dca77
Merge: f62a841 f8f6389
Author: Andreas Enge <address@hidden>
Date:   Sun Apr 26 16:05:39 2015 +0200

    Merge branch 'wip-glib' into master.
    
    Conflicts:
        gnu/packages/package-management.scm

 gnu/packages/cups.scm                              |    4 +-
 gnu/packages/glib.scm                              |   50 ++++++-----------
 gnu/packages/gnome.scm                             |   61 ++++---------------
 gnu/packages/gtk.scm                               |   22 +++----
 gnu/packages/libidn.scm                            |    4 +-
 .../patches/gobject-introspection-cc.patch         |   25 ++++-----
 gnu/packages/pdf.scm                               |    4 +-
 gnu/packages/xorg.scm                              |    4 +-
 8 files changed, 59 insertions(+), 115 deletions(-)