guix-commits
[Top][All Lists]
Advanced

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

14/14: Merge branch 'master' into staging


From: Marius Bakke
Subject: 14/14: Merge branch 'master' into staging
Date: Wed, 24 May 2017 16:12:47 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 36747eb0dad504686560afba51742f782f7c3646
Merge: ffaf5cb 0b7b8fb
Author: Marius Bakke <address@hidden>
Date:   Wed May 24 22:12:13 2017 +0200

    Merge branch 'master' into staging

 .mailmap                                |    2 +
 Makefile.am                             |   12 +-
 NEWS                                    |  611 ++-
 build-aux/update-NEWS.scm               |  161 +
 doc/guix.texi                           |    2 +-
 gnu/local.mk                            |    1 -
 gnu/packages/bioinformatics.scm         |  100 +-
 gnu/packages/emacs.scm                  |   10 +-
 gnu/packages/games.scm                  |   38 +-
 gnu/packages/gcc.scm                    |  136 +-
 gnu/packages/gnome.scm                  |   59 +-
 gnu/packages/java.scm                   | 1613 ++++++--
 gnu/packages/logging.scm                |   12 +-
 gnu/packages/music.scm                  |   90 +
 gnu/packages/node.scm                   |   20 +-
 gnu/packages/package-management.scm     |    8 +-
 gnu/packages/patches/gcj-arm-mode.patch |   36 -
 gnu/packages/patches/node-9077.patch    |   25 +-
 gnu/packages/python.scm                 |    9 +-
 gnu/packages/samba.scm                  |    4 +-
 gnu/packages/xdisorg.scm                |    8 +-
 gnu/system/install.scm                  |    1 +
 gnu/tests/ssh.scm                       |    2 +-
 guix/build-system/emacs.scm             |    4 +
 guix/build/emacs-build-system.scm       |   36 +-
 guix/packages.scm                       |    5 +-
 guix/scripts/lint.scm                   |   11 +-
 guix/scripts/package.scm                |   38 +-
 guix/scripts/publish.scm                |   12 +-
 guix/scripts/system.scm                 |    8 +-
 po/guix/da.po                           | 1098 +++--
 po/packages/da.po                       | 6703 +++++++++++++++++++------------
 32 files changed, 7342 insertions(+), 3533 deletions(-)




reply via email to

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