[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Thu, 24 Sep 2015 21:01:44 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 1007b6bf0bef3f662f65ffdd0d4383179dd07355
Merge: 12cd4dd a7a4fd9
Author: Ludovic Courtès <address@hidden>
Date: Thu Sep 24 22:18:07 2015 +0200
Merge branch 'master' into core-updates
doc/contributing.texi | 3 +
doc/emacs.texi | 49 ++++++++++++++++-
doc/guix.texi | 3 +-
emacs.am | 1 +
emacs/guix-command.el | 26 ++++++++-
emacs/guix-devel.el | 136 +++++++++++++++++++++++++++++++++++++++++++++
emacs/guix-guile.el | 35 ++++++++++++
emacs/guix-init.el | 2 +
gnu/packages/audio.scm | 34 +++++++++++
gnu/packages/graphics.scm | 40 +++++++++++++
gnu/packages/python.scm | 31 +++++++++-
guix/build/download.scm | 36 ++++++------
guix/profiles.scm | 22 ++++++--
guix/ui.scm | 5 +-
tests/cran.scm | 3 +-
tests/ui.scm | 7 ++
16 files changed, 400 insertions(+), 33 deletions(-)