Merge branch 'master' into staging
authorRicardo Wurmus <rekado@elephly.net>
Wed, 23 Jan 2019 11:08:27 +0000 (12:08 +0100)
committerRicardo Wurmus <rekado@elephly.net>
Wed, 23 Jan 2019 11:08:27 +0000 (12:08 +0100)
commit5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580
tree9f4ce853b9bc2d2b5433d8f0bec18749e93d8ba3
parent38f77be464b0b6ca76105d5f0a1b5e55fd694036
parent6a6799b27af8646da112d51bedb8e5ff6158e425
Merge branch 'master' into staging
doc/guix.texi
gnu/packages/base.scm
gnu/packages/ebook.scm
gnu/packages/games.scm
gnu/packages/linux.scm
gnu/packages/pdf.scm
gnu/packages/video.scm