[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Thu, 28 Jul 2016 18:14:20 +0000 (UTC) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 622c22ccb494de789588491ad94111f7a0311ddb
Merge: 212163f ae46cd0
Author: Mark H Weaver <address@hidden>
Date: Thu Jul 28 14:13:26 2016 -0400
Merge branch 'master' into core-updates
doc/contributing.texi | 28 +++
gnu/local.mk | 6 +-
gnu/packages.scm | 3 +-
gnu/packages/commencement.scm | 4 +-
gnu/packages/gd.scm | 10 +-
gnu/packages/gnome.scm | 2 +
gnu/packages/patches/gd-CVE-2016-5766.patch | 81 --------
gnu/packages/patches/gd-CVE-2016-6128.patch | 253 -----------------------
gnu/packages/patches/gd-CVE-2016-6132.patch | 55 -----
gnu/packages/patches/gd-CVE-2016-6214.patch | 66 ------
gnu/packages/patches/gd-fix-test-on-i686.patch | 34 ---
gnu/packages/patches/gd-fix-tests-on-i686.patch | 61 ++++++
gnu/packages/terminals.scm | 38 ++++
guix/packages.scm | 15 ++
tests/packages.scm | 18 ++
15 files changed, 171 insertions(+), 503 deletions(-)