Explorar o código

Merge branch 'maint'

Bastien Guerry %!s(int64=12) %!d(string=hai) anos
pai
achega
044c8c5ebb
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      lisp/ox-odt.el

+ 3 - 2
lisp/ox-odt.el

@@ -760,13 +760,14 @@ link's path."
   :type '(alist :key-type (string :tag "Type")
 		:value-type (regexp :tag "Path")))
 
-(defcustom org-odt-pixels-per-inch display-pixels-per-inch
+(defcustom org-odt-pixels-per-inch 96.0
   "Scaling factor for converting images pixels to inches.
 Use this for sizing of embedded images.  See Info node `(org)
 Images in ODT export' for more information."
   :type 'float
   :group 'org-export-odt
-  :version "24.1")
+  :version "24.4"
+  :package-version '(Org . "8.1"))
 
 
 ;;;; Src Block