diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /gnu/packages/freedesktop.scm | |
parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
download | guix-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar guix-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/freedesktop.scm')
-rw-r--r-- | gnu/packages/freedesktop.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 93df44cac7..a304c15334 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> +;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; |