[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 28 Oct 2016 17:40:29 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit a6447e7fb6a12f4a15b6bcffe09d97f78564f325
Merge: aa98b3b e359b31
Author: Leo Famulari <address@hidden>
Date: Fri Oct 28 13:40:10 2016 -0400
Merge branch 'master' into core-updates
gnu/local.mk | 1 +
gnu/packages/emacs.scm | 20 +++
gnu/packages/image.scm | 6 +-
gnu/packages/patches/libwebp-CVE-2016-9085.patch | 144 ++++++++++++++++++++++
gnu/packages/python.scm | 22 +++-
gnu/packages/qt.scm | 50 ++++++++
gnu/packages/web.scm | 2 +
7 files changed, 240 insertions(+), 5 deletions(-)