]> git.ipfire.org Git - thirdparty/cups.git/commit - cups/transcode.c
Merge changes from CUPS 1.5svn-r9136.
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 10 May 2010 22:58:10 +0000 (22:58 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Mon, 10 May 2010 22:58:10 +0000 (22:58 +0000)
commitcc75483441ba4241a6b0079e028d7699d99a6b0f
tree07af3321d8e2ad36d8fad169a15674ce7cc4c460
parent6d2f911bdd077fee9489b1084b960c4e68fc0658
Merge changes from CUPS 1.5svn-r9136.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2180 a1ca3aef-8c08-0410-bb20-df032aa958be
89 files changed:
CHANGES-1.4.txt
CHANGES.txt
Makedefs.in
Makefile
backend/Dependencies
backend/backend-private.h
backend/ipp.c
backend/snmp.c
cgi-bin/admin.c
config-scripts/cups-common.m4
config-scripts/cups-compiler.m4
config.h.in
cups/Makefile
cups/globals.c
cups/http-private.h
cups/http.c
cups/language-private.h
cups/language.c
cups/libcups.order
cups/libcups2.def
cups/libcups_s.exp
cups/mark.c
cups/ppd-private.h
cups/pwg-file.c
cups/pwg-ppd.c
cups/pwg-private.h
cups/sspi-private.h [new file with mode: 0644]
cups/sspi.c [new file with mode: 0644]
cups/testi18n.c
cups/testppd.c
cups/transcode.c
data/Makefile
data/euc-cn.txt [deleted file]
data/euc-jp.txt [deleted file]
data/euc-kr.txt [deleted file]
data/euc-tw.txt [deleted file]
data/iso-8859-1.txt [deleted file]
data/iso-8859-10.txt [deleted file]
data/iso-8859-11.txt [deleted file]
data/iso-8859-13.txt [deleted file]
data/iso-8859-14.txt [deleted file]
data/iso-8859-15.txt [deleted file]
data/iso-8859-16.txt [deleted file]
data/iso-8859-2.txt [deleted file]
data/iso-8859-3.txt [deleted file]
data/iso-8859-4.txt [deleted file]
data/iso-8859-5.txt [deleted file]
data/iso-8859-6.txt [deleted file]
data/iso-8859-7.txt [deleted file]
data/iso-8859-8.txt [deleted file]
data/iso-8859-9.txt [deleted file]
data/jis-x0213.txt [deleted file]
data/koi8-r.txt [deleted file]
data/koi8-u.txt [deleted file]
data/mac-roman.txt [deleted file]
data/windows-1250.txt [deleted file]
data/windows-1251.txt [deleted file]
data/windows-1252.txt [deleted file]
data/windows-1253.txt [deleted file]
data/windows-1254.txt [deleted file]
data/windows-1255.txt [deleted file]
data/windows-1256.txt [deleted file]
data/windows-1257.txt [deleted file]
data/windows-1258.txt [deleted file]
data/windows-1361.txt [deleted file]
data/windows-874.txt [deleted file]
data/windows-932.txt [deleted file]
data/windows-936.txt [deleted file]
data/windows-949.txt [deleted file]
data/windows-950.txt [deleted file]
filter/Makefile
filter/libcupsimage.order
packaging/cups.list.in
packaging/cups.spec.in
scheduler/Makefile
scheduler/cups-driverd.cxx
scheduler/cupsd.order
scheduler/dirsvc.c
scheduler/mime.h
scheduler/network.c
scheduler/printers.c
scheduler/process.c
scheduler/type.c
systemv/lpstat.c
test/ipp-1.1.test
test/ipp-2.0.test
test/ipp-2.1.test
test/ipptool.c
vcnet/config.h