diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-09-14 02:27:22 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-09-14 02:27:22 +0000 |
commit | db1f069b7f02a8e17a9e4abf8f182530b882c6c9 (patch) | |
tree | 9d1371a56b0ef8f51d62db6ebfe74e5a8534ffe5 /conf | |
parent | 76cd9e37aaf496aab887d499f4917b60e91d6d25 (diff) | |
download | cups-db1f069b7f02a8e17a9e4abf8f182530b882c6c9.tar.gz |
Merge changes from CUPS 1.3.1.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@470 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r-- | conf/mime.convs.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/mime.convs.in b/conf/mime.convs.in index ad9ab9041..d6f4fb371 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -1,5 +1,5 @@ # -# "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $" +# "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $" # # DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW # VERSIONS OF CUPS. Instead, create a "local.convs" file that @@ -109,5 +109,5 @@ application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster @DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw 0 - # -# End of "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $". +# End of "$Id: mime.convs.in 6761 2007-08-02 17:58:59Z mike $". # |