diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-04-06 12:00:29 +0200 |
| commit | 933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch) | |
| tree | f10581ed0da1911eed9b02e69d999ba481d9d3c6 /gnu/packages/emacs.scm | |
| parent | f8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff) | |
| parent | 998afc3608242b75051f43ece36d52474c51e285 (diff) | |
| download | patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 215061a67a..db5668e1fc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -370,7 +370,7 @@ on stdout instead of using a socket as the Emacsclient does.") (define-public magit (package (name "magit") - (version "2.5.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append @@ -378,7 +378,7 @@ on stdout instead of using a socket as the Emacsclient does.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0i6qpx5szzc4kyfcdhaic8gif0sqdqcya1niyj93lpvw66jcxsxa")))) + "04km5j6118yqz7h3dyfd4ijjd6w3pb76pjlaj25wh1bchf1yilir")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-no-x))) |