[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into xorg-updates
From: |
Mark H. Weaver |
Subject: |
01/01: Merge branch 'master' into xorg-updates |
Date: |
Wed, 24 Dec 2014 15:07:00 +0000 |
mhw pushed a commit to branch xorg-updates
in repository guix.
commit f948656c171ac1a8fae90fd0592ab16fdb895776
Merge: 7dcf67c 764c077
Author: Mark H Weaver <address@hidden>
Date: Wed Dec 24 10:07:03 2014 -0500
Merge branch 'master' into xorg-updates
gnu/packages.scm | 41 ++++++++++++++++------------
guix/build-system/python.scm | 42 ++++++++++++----------------
guix/packages.scm | 61 ++++++++++++++++++++---------------------
3 files changed, 71 insertions(+), 73 deletions(-)