[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into core-updates
From: |
Mark H. Weaver |
Subject: |
01/03: Merge branch 'master' into core-updates |
Date: |
Wed, 14 Feb 2018 03:43:36 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 932c98326daa26657c970e38583f7904364cdd66
Merge: 870541d 7553832
Author: Mark H Weaver <address@hidden>
Date: Wed Feb 14 03:40:08 2018 -0500
Merge branch 'master' into core-updates
.gitignore | 1 +
doc/guix.texi | 6 ++++--
gnu/packages/bioinformatics.scm | 4 ++--
gnu/packages/bootloaders.scm | 1 +
gnu/packages/freeipmi.scm | 4 ++--
gnu/packages/gnuzilla.scm | 7 ++++++-
gnu/packages/image-viewers.scm | 4 ++--
gnu/packages/linux.scm | 5 +++--
gnu/packages/python.scm | 4 ++--
gnu/packages/video.scm | 43 +++++++++--------------------------------
10 files changed, 32 insertions(+), 47 deletions(-)