Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Wed, 20 Sep 2017 16:49:26 +0000 (18:49 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Wed, 20 Sep 2017 16:49:26 +0000 (18:49 +0200)
commit58366883f2f1516a4a02f5b4e2a70e86481827b5
treefa67d714c4596164b341118132728a48135f4759
parentf40aef6b3b56e1e5fb6e6ac29bd372000e13982f
parent9a1c4a981bdd7eeca76aaf73a57d6841918821c2
Merge branch 'master' into staging
gnu/local.mk
gnu/packages/check.scm
gnu/packages/compression.scm
gnu/packages/cups.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/video.scm