[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: |
Fri, 29 Jul 2016 22:30:30 +0000 (UTC) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 359aba76b655813895e7ed9290110e3750914d8b
Merge: 0bab3af 9bdf56d
Author: Mark H Weaver <address@hidden>
Date: Fri Jul 29 18:29:58 2016 -0400
Merge branch 'master' into core-updates
gnu/local.mk | 1 +
gnu/packages/databases.scm | 6 +++---
gnu/packages/gd.scm | 3 ++-
gnu/packages/networking.scm | 4 ++--
gnu/packages/patches/gd-fix-gd2-read-test.patch | 14 ++++++++++++++
gnu/packages/protobuf.scm | 7 ++++---
guix/scripts/size.scm | 11 +++++++----
7 files changed, 33 insertions(+), 13 deletions(-)