[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
02/02: Merge branch 'master' into staging |
|
Date: |
Wed, 23 Jan 2019 06:10:29 -0500 (EST) |
rekado pushed a commit to branch staging
in repository guix.
commit 2b965485e2f3a8755efff58fc1abad75df3e37a0
Merge: 5aaef5c b2c0840
Author: Ricardo Wurmus <address@hidden>
Date: Wed Jan 23 12:08:54 2019 +0100
Merge branch 'master' into staging
gnu/packages/emacs-xyz.scm | 159 ++++++++++++++++++++++++++-------------------
gnu/packages/wine.scm | 14 ++--
2 files changed, 99 insertions(+), 74 deletions(-)