1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge Org 8.2.6-1.

The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.
This commit is contained in:
Bastien Guerry 2014-04-22 16:07:45 +02:00
parent d5ff4ded7a
commit 30cb51f1bc
33 changed files with 1460 additions and 691 deletions

View file

@ -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.5c"))
(let ((org-release "8.2.6"))
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.5c"))
(let ((org-git-version "release_8.2.6-1"))
org-git-version))
(provide 'org-version)