git.ipfire.org Git - thirdparty/cups.git/commit - systemv/cupstestppd.c

]> git.ipfire.org Git - thirdparty/cups.git/commit - systemv/cupstestppd.c

projects / thirdparty / cups.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: be2c687) | patch

author	mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
	Fri, 18 Jul 2008 16:43:43 +0000 (16:43 +0000)
committer	mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
	Fri, 18 Jul 2008 16:43:43 +0000 (16:43 +0000)
commit	d33925376c96d1797100c4f353bd0c72ff8dea32
tree	46c0cbcdc55994289bd78f2a19c3d24a5ec0c62b	tree \| snapshot
parent	be2c687d4566723ce7685e72357b2eea0720aee8	commit \| diff

Merge changes from constraints branch.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@7757 7a7537e8-13f0-0310-91df-b6672ffda945

18 files changed:

cups/Dependencies		diff \| blob \| blame \| history
cups/Makefile		diff \| blob \| blame \| history
cups/conflicts.c	[new file with mode: 0644]	blob
cups/cups.h		diff \| blob \| blame \| history
cups/libcups.exp		diff \| blob \| blame \| history
cups/libcups_s.exp		diff \| blob \| blame \| history
cups/mark.c		diff \| blob \| blame \| history
cups/ppd-private.h		diff \| blob \| blame \| history
cups/ppd.c		diff \| blob \| blame \| history
cups/ppd.h		diff \| blob \| blame \| history
cups/test.ppd		diff \| blob \| blame \| history
cups/test2.ppd	[new file with mode: 0644]	blob
cups/testppd.c		diff \| blob \| blame \| history
doc/help/api-httpipp.html		diff \| blob \| blame \| history
doc/help/api-ppd.html		diff \| blob \| blame \| history
doc/help/spec-ppd.html		diff \| blob \| blame \| history
systemv/Makefile		diff \| blob \| blame \| history
systemv/cupstestppd.c		diff \| blob \| blame \| history

Unnamed repository; edit this file 'description' to name the repository.