01/01: Merge commit '2ff8dea' into gnome-updates

[Kei Kebreau]

kkebreau pushed a commit to branch gnome-updates
in repository guix.

commit f18f4364d83075c595e4ca2aa20098eff77939a4
Merge: dc4b64a 2ff8dea
Author: Kei Kebreau <address@hidden>
Date:   Sun Apr 30 13:58:06 2017 -0400

    Merge commit '2ff8dea' into gnome-updates

 gnu/packages/base.scm                          |  6 ++---
 gnu/packages/gtk.scm                           |  8 +++---
 gnu/packages/patches/libdrm-symbol-check.patch | 25 +++++++----------
 gnu/packages/pulseaudio.scm                    | 37 ++++----------------------
 gnu/packages/video.scm                         |  4 +--
 gnu/packages/xdisorg.scm                       |  4 +--
 gnu/packages/xorg.scm                          | 25 ++++++-----------
 7 files changed, 34 insertions(+), 75 deletions(-)

diff --cc gnu/packages/pulseaudio.scm
index d258c59,42fb5df..cd79652
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@@ -3,8 -3,8 +3,9 @@@
  ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
  ;;; Copyright © 2016 Efraim Flashner <address@hidden>
  ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2017 Thomas Danckaert <address@hidden>
  ;;; Copyright © 2017 Leo Famulari <address@hidden>
 +;;; Copyright © 2017 Stefan Reichör <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;