summaryrefslogtreecommitdiff
path: root/lisp/org/org-version.el
diff options
context:
space:
mode:
authorBastien Guerry <bzg@gnu.org>2013-01-08 16:31:30 +0100
committerBastien Guerry <bzg@gnu.org>2013-01-08 16:31:30 +0100
commit6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb (patch)
treef9115fbdc6e42a73b57e20a27334057b80275814 /lisp/org/org-version.el
parentc7cf0ebc24d66371c8d48ad72f65e72a2a027f06 (diff)
downloademacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.tar.gz
emacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.tar.bz2
emacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.zip
Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog.
Diffstat (limited to 'lisp/org/org-version.el')
-rw-r--r--lisp/org/org-version.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 796d79ffa34..f4f4bfb7651 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@
(defun org-git-version ()
"The Git version of org-mode.
Inserted by installing org-mode or when a release is made."
- (let ((org-git-version "7.9.3+-GNU-Emacs-24-3 (commit 31c1aeab)"))
+ (let ((org-git-version "7.9.3+-GNU-Emacs-24-3 (commit c8c217aa)"))
org-git-version))
;;;###autoload
(defvar org-odt-data-dir "/usr/share/emacs/etc/org"