mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 04:32:52 +00:00
Merge branch 'maint'
This commit is contained in:
commit
044c8c5ebb
|
@ -760,13 +760,14 @@ link's path."
|
||||||
:type '(alist :key-type (string :tag "Type")
|
:type '(alist :key-type (string :tag "Type")
|
||||||
:value-type (regexp :tag "Path")))
|
: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.
|
"Scaling factor for converting images pixels to inches.
|
||||||
Use this for sizing of embedded images. See Info node `(org)
|
Use this for sizing of embedded images. See Info node `(org)
|
||||||
Images in ODT export' for more information."
|
Images in ODT export' for more information."
|
||||||
:type 'float
|
:type 'float
|
||||||
:group 'org-export-odt
|
:group 'org-export-odt
|
||||||
:version "24.1")
|
:version "24.4"
|
||||||
|
:package-version '(Org . "8.1"))
|
||||||
|
|
||||||
|
|
||||||
;;;; Src Block
|
;;;; Src Block
|
||||||
|
|
Loading…
Reference in a new issue