summaryrefslogtreecommitdiff
path: root/lisp/org/org-version.el
diff options
context:
space:
mode:
authorBastien Guerry <bzg@gnu.org>2014-01-07 14:22:53 +0100
committerBastien Guerry <bzg@gnu.org>2014-01-07 14:22:53 +0100
commit3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc (patch)
treeca02feb436782a74af050f15c02843da84a95f4a /lisp/org/org-version.el
parent2b6b4f204c819569734c092532d56da85eef503b (diff)
downloademacs-3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc.tar.gz
emacs-3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc.tar.bz2
emacs-3c8b09ca2e01b0ef0c1b6651fab54194f0019fdc.zip
Merge Org version 8.2.5c.
Diffstat (limited to 'lisp/org/org-version.el')
-rw-r--r--lisp/org/org-version.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 63abb9d0015..7ccddb52a92 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
(defun org-release ()
"The release version of org-mode.
Inserted by installing org-mode or when a release is made."
- (let ((org-release "8.2.3a"))
+ (let ((org-release "8.2.5c"))
org-release))
;;;###autoload
(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 "release_8.2.3a"))
+ (let ((org-git-version "release_8.2.5c"))
org-git-version))
;;;###autoload
(defvar org-odt-data-dir "/usr/share/emacs/etc/org"