Merge from origin/emacs-25

[gnu-emacs] / lisp / org / org-version.el

diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 4fa865308e98c79f2c5066cef40338a58dc82068..aae65cc6d37e94eb0817d445d5d15412cf31e6df 100644 (file)
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,17 +5,14 @@
 (defun org-release ()
   "The release version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-release "7.9.3f"))
+   (let ((org-release "8.2.10"))
      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_7.9.3f-17-g7524ef"))
+   (let ((org-git-version "release_8.2.10"))
      org-git-version))
-;;;###autoload
-(defvar org-odt-data-dir "/usr/share/emacs/etc/org"
-  "The location of ODT styles.")
 \f
 (provide 'org-version)
 \f