[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Ricardo Wurmus |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Mon, 4 Jun 2018 05:26:02 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit 32da38d5721663a470b335f86b67cffdc4f34f0a
Merge: 0c0431f c0e7a52
Author: Ricardo Wurmus <address@hidden>
Date: Mon Jun 4 11:25:48 2018 +0200
Merge branch 'master' into core-updates
gnu/local.mk | 1 +
gnu/packages/education.scm | 11 ++++-
gnu/packages/irc.scm | 3 +-
gnu/packages/password-utils.scm | 14 +++++-
gnu/packages/patches/quassel-qt-5.11.patch | 72 ++++++++++++++++++++++++++++++
gnu/packages/qt.scm | 16 ++++---
gnu/packages/w3m.scm | 7 ++-
7 files changed, 113 insertions(+), 11 deletions(-)