Merge branch 'master' into output

[pspp] / config / devices

diff --git a/config/devices b/config/devices
index d42500cf4a04c687007dbe90d273ce228d435b64..3bc685a004fb7eb2cdf871a4e696b89557f37651 100644 (file)
--- a/config/devices
+++ b/config/devices
@@ -85,6 +85,8 @@ pdf:cairo:listing:
 svg:cairo:listing:output-type=svg output-file="pspp.svg"
 ps-cairo:cairo:listing:output-type=ps output-file="pspp-cairo.ps"
 
+odt:odf:listing:debug=off output-file="pspp.odt"
+
 # Devices that support the IBM PC line-drawing characters.
 define ibmpc-graphics \
   box[0000]='\x20' box[0001]='\xb3' box[0002]='\xba' \