aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.10.1.txt6
-rw-r--r--default.mk10
-rw-r--r--lisp/git-commit.el2
-rw-r--r--lisp/magit-popup.el2
-rw-r--r--lisp/magit.el2
5 files changed, 14 insertions, 8 deletions
diff --git a/Documentation/RelNotes/2.10.1.txt b/Documentation/RelNotes/2.10.1.txt
index 49c3ceb..7f90600 100644
--- a/Documentation/RelNotes/2.10.1.txt
+++ b/Documentation/RelNotes/2.10.1.txt
@@ -49,3 +49,9 @@ This release also contains typo fixes and other documentation fixes.
Authors
-------
+
+ 16 Jonas Bernoulli
+ 4 Kyle Meyer
+ 2 Alex Kost
+ 1 Kévin Le Gouguec
+ 1 Radon Rosborough
diff --git a/default.mk b/default.mk
index c03928c..589144f 100644
--- a/default.mk
+++ b/default.mk
@@ -97,14 +97,14 @@ MAGIT_VERSION = 2.10
ASYNC_VERSION = 1.9
DASH_VERSION = 2.13.0
WITH_EDITOR_VERSION = 2.5.9
-GIT_COMMIT_VERSION = 2.9.0
-MAGIT_POPUP_VERSION = 2.9.0
+GIT_COMMIT_VERSION = 2.10.0
+MAGIT_POPUP_VERSION = 2.10.0
ASYNC_MELPA_SNAPSHOT = 20161103.1036
DASH_MELPA_SNAPSHOT = 20161121.55
-WITH_EDITOR_MELPA_SNAPSHOT = 20161231.826
-GIT_COMMIT_MELPA_SNAPSHOT = 20161227.125
-MAGIT_POPUP_MELPA_SNAPSHOT = 20170104.557
+WITH_EDITOR_MELPA_SNAPSHOT = 20170111.609
+GIT_COMMIT_MELPA_SNAPSHOT = 20170112.334
+MAGIT_POPUP_MELPA_SNAPSHOT = 20170104.924
EMACS_VERSION = 24.4
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 300ea99..266cf5c 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -11,7 +11,7 @@
;; Marius Vollmer <marius.vollmer@gmail.com>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
-;; Package-Requires: ((emacs "24.4") (dash "20161121.55") (with-editor "20161231.826"))
+;; Package-Requires: ((emacs "24.4") (dash "2.13.0") (with-editor "2.5.9"))
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit
diff --git a/lisp/magit-popup.el b/lisp/magit-popup.el
index feaea55..fd1e6cc 100644
--- a/lisp/magit-popup.el
+++ b/lisp/magit-popup.el
@@ -12,7 +12,7 @@
;; Author: Jonas Bernoulli <jonas@bernoul.li>
;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
-;; Package-Requires: ((emacs "24.4") (async "20161103.1036") (dash "20161121.55"))
+;; Package-Requires: ((emacs "24.4") (async "1.9") (dash "2.13.0"))
;; Keywords: bindings
;; Homepage: https://github.com/magit/magit
diff --git a/lisp/magit.el b/lisp/magit.el
index 5f4635e..ba1373c 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -16,7 +16,7 @@
;; Rémi Vanicat <vanicat@debian.org>
;; Yann Hodique <yann.hodique@gmail.com>
-;; Package-Requires: ((emacs "24.4") (async "20161103.1036") (dash "20161121.55") (with-editor "20161231.826") (git-commit "20161227.125") (magit-popup "20170104.557"))
+;; Package-Requires: ((emacs "24.4") (async "1.9") (dash "2.13.0") (with-editor "2.5.9") (git-commit "2.10.0") (magit-popup "2.10.0"))
;; Keywords: git tools vc
;; Homepage: https://github.com/magit/magit