[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: |
Sat, 20 Dec 2014 20:08:22 +0000 |
mhw pushed a commit to branch xorg-updates
in repository guix.
commit 7dcf67c070b926274aaef3234edfb2ea77c24862
Merge: d2611ff ce44657
Author: Mark H Weaver <address@hidden>
Date: Sat Dec 20 15:08:38 2014 -0500
Merge branch 'master' into xorg-updates
gnu/packages/gnome.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
gnu/packages/xfce.scm | 30 +++++++++++++++++++++++++
nix-upstream | 1 -
3 files changed, 86 insertions(+), 2 deletions(-)