]> git.ipfire.org Git - thirdparty/cups.git/commit - Makefile
Merge changes from CUPS 1.4svn-r7770.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 18 Jul 2008 21:45:31 +0000 (21:45 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Fri, 18 Jul 2008 21:45:31 +0000 (21:45 +0000)
commit5d6412a9f1d6faef517cc8038f9d3784afef9945
tree1ea3f3a12db3767627b134a0d7ee6f1a141cdd85
parente78998dfebacc717ae6e04735cf1ab0a9fb92532
Merge changes from CUPS 1.4svn-r7770.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@872 a1ca3aef-8c08-0410-bb20-df032aa958be
CHANGES-1.3.txt
Makefile
cups/conflicts.c
cups/mark.c
desktop/cups.desktop
scheduler/dirsvc.c
scheduler/ipp.c
scheduler/job.c