]> git.ipfire.org Git - thirdparty/cups.git/commit - systemv/cupstestppd.c
Fix constraints against custom options and PageSize/PageRegion.
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Fri, 18 Jul 2008 18:20:02 +0000 (18:20 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Fri, 18 Jul 2008 18:20:02 +0000 (18:20 +0000)
commit09a27d08df0c415c69dd6b7aa1d2d93485c8942a
tree5c3f744ffa1e619576063e1b89117ec6bec01368
parent987c3d4926bfd5e0145c5cf261fa34215b90e334
Fix constraints against custom options and PageSize/PageRegion.

Fix conflict resolution to not automatically change the page size.

Fix testppd tests to account for PageSize/PageRegion changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7760 7a7537e8-13f0-0310-91df-b6672ffda945
cups/conflicts.c
cups/ppd.c
cups/testppd.c
systemv/cupstestppd.c