summaryrefslogtreecommitdiff
path: root/lisp/org/org-version.el
diff options
context:
space:
mode:
authorBastien Guerry <bzg@gnu.org>2013-01-08 19:49:37 +0100
committerBastien Guerry <bzg@gnu.org>2013-01-08 19:49:37 +0100
commit2e3c2398e324b26d69f4cc997e29b5cfe5870cd5 (patch)
tree1a880fa9fd8ef2d33644dee9fc0fa7f61f4a93cf /lisp/org/org-version.el
parentd576dd9bde77c398779645ff7f369f7c345106c0 (diff)
downloademacs-2e3c2398e324b26d69f4cc997e29b5cfe5870cd5.tar.gz
emacs-2e3c2398e324b26d69f4cc997e29b5cfe5870cd5.tar.bz2
emacs-2e3c2398e324b26d69f4cc997e29b5cfe5870cd5.zip
Merge Org up to commit 4cac75153. Some ChangeLog formatting fixes.
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 f4f4bfb7651..f638e57ad94 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 c8c217aa)"))
+ (let ((org-git-version "7.9.3+-GNU-Emacs-24-3 (commit 4cac75153)"))
org-git-version))
;;;###autoload
(defvar org-odt-data-dir "/usr/share/emacs/etc/org"