guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: Merge branch 'master' into staging


From: Marius Bakke
Subject: 03/03: Merge branch 'master' into staging
Date: Thu, 21 Sep 2017 14:35:06 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit efa0ba499e78af732f302cbcd4002df6e259921e
Merge: 595dcd4 e2a95f8
Author: Marius Bakke <address@hidden>
Date:   Thu Sep 21 20:34:49 2017 +0200

    Merge branch 'master' into staging

 gnu/local.mk                                       |  1 -
 gnu/packages/astronomy.scm                         | 10 +--
 gnu/packages/emacs.scm                             |  7 +-
 gnu/packages/gnome.scm                             | 34 +++++++++
 gnu/packages/machine-learning.scm                  | 11 ++-
 .../emacs-unsafe-enriched-mode-translations.patch  | 85 ----------------------
 gnu/packages/simulation.scm                        |  4 +-
 gnu/packages/version-control.scm                   | 38 ++++++++++
 gnu/packages/vim.scm                               |  4 +-
 gnu/packages/virtualization.scm                    |  4 +-
 10 files changed, 93 insertions(+), 105 deletions(-)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]