tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-07-10 12:13:09 +02:00
parent e29a4703c7 681bd0cfd9
commit 044c8c5ebb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ox-odt.el
View File

@ -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