mbakke pushed a commit to branch master
in repository guix.
commit a66853810e75055091e9ab5c2fc341fa1811cda4
Merge: fb8966a a9fe388
Author: Marius Bakke <mba...@fastmail.com>
Date: Mon Apr 30 19:26:03 2018 +0200
Merge branch 'staging'
gnu/packages/build-tools.scm | 4 ++--
gnu/packages/certs.scm | 4 ++--
gnu/packages/freedesktop.scm | 12 ++++++------
gnu/packages/gl.scm | 4 ++--
gnu/packages/gnuzilla.scm | 4 ++--
gnu/packages/gstreamer.scm | 34 +++++++++++++++++-----------------
gnu/packages/gtk.scm | 12 ++++++------
gnu/packages/linux.scm | 20 ++++++++++----------
gnu/packages/tex.scm | 18 +++++++++++++++++-
gnu/packages/xdisorg.scm | 4 ++--
guix/build/meson-build-system.scm | 3 ++-
11 files changed, 68 insertions(+), 51 deletions(-)
