diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-04-11 18:53:27 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-04-11 18:53:27 +0000 |
| commit | 07ed0e9a4385437b52e7195b681e600c2f1c5623 (patch) | |
| tree | 6dda615ae2f467bbc8c311ba8066bf63c20ec1d7 /data | |
| parent | 84315f460a5c9eb38f7fcc4204acf98ed2b29406 (diff) | |
| download | cups-07ed0e9a4385437b52e7195b681e600c2f1c5623.tar.gz | |
Merge changes from CUPS 1.5svn-r9675.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3122 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'data')
| -rw-r--r-- | data/media.defs | 4 | ||||
| -rw-r--r-- | data/testprint.in | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/data/media.defs b/data/media.defs index 8d5d278e7..98148729e 100644 --- a/data/media.defs +++ b/data/media.defs @@ -3,7 +3,7 @@ * * Adobe standard media size definitions for the CUPS PPD file compiler. * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2011 by Apple Inc. * Copyright 1997-2005 by Easy Software Products. * * These codedinstructions, statements, and computer programs are the @@ -165,7 +165,7 @@ #media "LetterPlus/US Letter Oversize" 612 914 #media "LetterRotated/US Letter" 792 612 #media "LetterSmall/US Letter Small" 612 792 -#media "Monarch/Monarch" 279 540 +#media "Monarch/Envelope Monarch" 279 540 #media "Note/Note" 612 792 #media "Postcard/Postcard" 284 419 #media "PostcardRotated/Postcard" 419 284 diff --git a/data/testprint.in b/data/testprint.in index 5eff73140..8cee3ab4f 100644 --- a/data/testprint.in +++ b/data/testprint.in @@ -2,7 +2,6 @@ Show printer-name printer-info printer-location printer-make-and-model printer-driver-name printer-driver-version paper-size imageable-area Header Printer Test Page Footer Printer Test Page -Notice This test page was produced by CUPS @CUPS_VERSION@. +Notice CUPS @CUPS_VERSION@. Image images/cups.png Image images/color-wheel.png - |