]> git.ipfire.org Git - thirdparty/cups.git/commit - systemv/cupstestppd.c
projects / thirdparty / cups.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 02aabcd) | patch
Update conflict resolution code to try each option pair in the cupsUIResolver
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Wed, 4 Mar 2009 23:44:55 +0000 (23:44 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Wed, 4 Mar 2009 23:44:55 +0000 (23:44 +0000)
commitab59a541e11fba652ab283807af9aa10db3372ae
treed8ae4b76297666adb938749af6bbb192610e1986tree | snapshot
parent02aabcdace07cc60270b76a05c16e1b739ad0e56commit | diff
Update conflict resolution code to try each option pair in the cupsUIResolver
in order, so that we can actually do nice conflict resolution.

Update documentation to reflect this.

Update unit test program and files.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@8403 7a7537e8-13f0-0310-91df-b6672ffda945
cups/Makefile diff | blob | blame | history
cups/conflicts.c diff | blob | blame | history
cups/test.ppd diff | blob | blame | history
cups/test2.ppd diff | blob | blame | history
cups/testppd.c diff | blob | blame | history
doc/help/spec-ppd.html diff | blob | blame | history
systemv/cupstestppd.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.