diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
| commit | bdebdb64b35d6a0a28e04335f4e8e46949206ad3 (patch) | |
| tree | ea3e0d00bd8da93ae89e86744a80f4e162c5361c /lisp/org/org-version.el | |
| parent | ccc83f50a4ca55842bcf955b9f8156c17aa43864 (diff) | |
| download | emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.gz emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.bz2 emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.zip | |
Merge upstream Org (from commit acbbe2)
Diffstat (limited to 'lisp/org/org-version.el')
| -rw-r--r-- | lisp/org/org-version.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 688947def52..9fcea6725e3 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -11,10 +11,10 @@ (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.2-GNU-Emacs-24-3")) + (let ((org-git-version "release_7.9.2-68-g7a9d34")) org-git-version)) ;;;###autoload -(defconst org-odt-data-dir "/usr/share/emacs/etc/org" +(defvar org-odt-data-dir "/usr/share/emacs/etc/org" "The location of ODT styles.") (provide 'org-version) |