[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into security-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into security-updates |
|
Date: |
Thu, 11 Feb 2016 20:02:44 +0000 |
mhw pushed a commit to branch security-updates
in repository guix.
commit c1ee70cd3221f74376c21c784f21d4f46f40d057
Merge: 827f72e 59d4cf1
Author: Mark H Weaver <address@hidden>
Date: Thu Feb 11 15:01:56 2016 -0500
Merge branch 'master' into security-updates
gnu/packages/admin.scm | 4 ++--
gnu/packages/feh.scm | 5 +++--
gnu/packages/fribidi.scm | 5 +++--
gnu/packages/linux.scm | 8 ++++----
gnu/packages/music.scm | 6 +++---
gnu/packages/video.scm | 4 ++--
gnu/packages/web.scm | 5 +++--
7 files changed, 20 insertions(+), 17 deletions(-)