Merge branch 'maint'

2012-10-01 07:53:01 +02:00 · 2012-10-01 07:53:01 +02:00 · 7f74da3f22
parent 934208ece1 1df9907b50
commit 7f74da3f22
1 changed files with 1 additions and 1 deletions
--- a/mk/org-fixup.el
+++ b/mk/org-fixup.el
@ -52,7 +52,7 @@ the Git work tree)."
   (let ((org-git-version \"" org-git-version "\"))
     org-git-version))
 ;;;\#\#\#autoload
-\(defconst org-odt-data-dir \"" odt-dir "\"
+\(defvar org-odt-data-dir \"" odt-dir "\"
  \"The location of ODT styles.\")
 \f\n\(provide 'org-version\)
 \f\n;; Local Variables:\n;; version-control: never