diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-01-19 00:18:37 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-01-19 00:18:37 -0500 |
| commit | afe9f409491a055e5d058c8f747e80d1506391e5 (patch) | |
| tree | 3b3747c9d2df32019a46b283b94f0a7af05ebf1d /gnu/packages/emacs.scm | |
| parent | bb8afbf5a1fbc85f700c0e07ce5581637e3674dc (diff) | |
| parent | 1348185ac2bb48b373495830267cff8ddc6b1fa5 (diff) | |
| download | patches-afe9f409491a055e5d058c8f747e80d1506391e5.tar patches-afe9f409491a055e5d058c8f747e80d1506391e5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/emacs.scm')
| -rw-r--r-- | gnu/packages/emacs.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ba7bd49901..2b1152a54d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com> +;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; @@ -324,7 +324,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public magit (package (name "magit") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append @@ -332,7 +332,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "1wnx034adkwhbsydd10il2099hpzz351kp39sri8s1yd43f795gf")))) + "1wbam4l36061mj79qlgzrv4xbzhk2dk6gnv45610zwfnf24ikdsp")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-no-x))) |