]> git.ipfire.org Git - thirdparty/cups.git/log
thirdparty/cups.git
13 years agoMerge changes from CUPS 1.5svn-r9641
msweet [Wed, 23 Mar 2011 00:05:29 +0000 (00:05 +0000)] 
Merge changes from CUPS 1.5svn-r9641

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3071 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9631.
msweet [Sun, 20 Mar 2011 21:48:45 +0000 (21:48 +0000)] 
Merge changes from CUPS 1.5svn-r9631.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3062 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoSync up some other changes.
msweet [Mon, 14 Mar 2011 18:48:04 +0000 (18:48 +0000)] 
Sync up some other changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3047 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9602.
msweet [Mon, 14 Mar 2011 18:45:10 +0000 (18:45 +0000)] 
Merge changes from CUPS 1.5svn-r9602.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3046 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9567
msweet [Fri, 25 Feb 2011 01:40:44 +0000 (01:40 +0000)] 
Merge changes from CUPS 1.5svn-r9567

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3015 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9525
msweet [Fri, 11 Feb 2011 21:20:35 +0000 (21:20 +0000)] 
Merge changes from CUPS 1.5svn-r9525

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2975 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoFix bad merge.
msweet [Tue, 18 Jan 2011 00:26:43 +0000 (00:26 +0000)] 
Fix bad merge.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2951 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9491.
msweet [Mon, 17 Jan 2011 23:54:15 +0000 (23:54 +0000)] 
Merge changes from CUPS 1.5svn-r9491.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2949 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9407.
msweet [Tue, 14 Dec 2010 21:25:17 +0000 (21:25 +0000)] 
Merge changes from CUPS 1.5svn-r9407.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2910 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9400
msweet [Fri, 3 Dec 2010 06:58:01 +0000 (06:58 +0000)] 
Merge changes from CUPS 1.5svn-r9400

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2890 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9385.
msweet [Tue, 30 Nov 2010 03:16:24 +0000 (03:16 +0000)] 
Merge changes from CUPS 1.5svn-r9385.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2873 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9374.
msweet [Wed, 17 Nov 2010 18:58:56 +0000 (18:58 +0000)] 
Merge changes from CUPS 1.5svn-r9374.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2859 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9352.
msweet [Sat, 6 Nov 2010 05:13:04 +0000 (05:13 +0000)] 
Merge changes from CUPS 1.5svn-r9352.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2848 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9323.
msweet [Fri, 1 Oct 2010 22:44:58 +0000 (22:44 +0000)] 
Merge changes from CUPS 1.5svn-r9323.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2733 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9313.
msweet [Wed, 22 Sep 2010 22:13:21 +0000 (22:13 +0000)] 
Merge changes from CUPS 1.5svn-r9313.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2683 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9229.
msweet [Mon, 9 Aug 2010 22:14:41 +0000 (22:14 +0000)] 
Merge changes from CUPS 1.5svn-r9229.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2468 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9214.
msweet [Tue, 27 Jul 2010 00:17:12 +0000 (00:17 +0000)] 
Merge changes from CUPS 1.5svn-r9214.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2395 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9198.
msweet [Thu, 8 Jul 2010 20:45:48 +0000 (20:45 +0000)] 
Merge changes from CUPS 1.5svn-r9198.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2309 a1ca3aef-8c08-0410-bb20-df032aa958be

13 years agoMerge changes from CUPS 1.5svn-r9136.
msweet [Mon, 10 May 2010 22:58:10 +0000 (22:58 +0000)] 
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

14 years agoMerge changes from CUPS 1.5svn-r9105.
msweet [Mon, 12 Apr 2010 04:23:14 +0000 (04:23 +0000)] 
Merge changes from CUPS 1.5svn-r9105.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2070 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r9098.
msweet [Fri, 9 Apr 2010 22:45:27 +0000 (22:45 +0000)] 
Merge changes from CUPS 1.5svn-r9098.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2056 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoImport changes from CUPS 1.5svn-r9085.
msweet [Wed, 7 Apr 2010 07:11:03 +0000 (07:11 +0000)] 
Import changes from CUPS 1.5svn-r9085.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2046 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMake sure EOL is right on import file.
msweet [Tue, 30 Mar 2010 23:24:57 +0000 (23:24 +0000)] 
Make sure EOL is right on import file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2017 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r9062.
msweet [Tue, 30 Mar 2010 23:24:27 +0000 (23:24 +0000)] 
Merge changes from CUPS 1.5svn-r9062.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2016 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoRemove bad file.
msweet [Tue, 30 Mar 2010 23:22:52 +0000 (23:22 +0000)] 
Remove bad file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2015 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoAdd a missing change to the test script.
msweet [Wed, 24 Mar 2010 14:33:57 +0000 (14:33 +0000)] 
Add a missing change to the test script.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1993 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r9049 (private header support)
msweet [Wed, 24 Mar 2010 14:32:08 +0000 (14:32 +0000)] 
Merge changes from CUPS 1.5svn-r9049 (private header support)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1992 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r9041.
msweet [Tue, 23 Mar 2010 21:42:49 +0000 (21:42 +0000)] 
Merge changes from CUPS 1.5svn-r9041.

(all of the media changes)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1987 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r9037.
msweet [Thu, 11 Mar 2010 06:44:46 +0000 (06:44 +0000)] 
Merge changes from CUPS 1.5svn-r9037.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1968 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r9022.
msweet [Wed, 3 Mar 2010 22:36:38 +0000 (22:36 +0000)] 
Merge changes from CUPS 1.5svn-r9022.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1937 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r9000.
msweet [Thu, 25 Feb 2010 00:52:27 +0000 (00:52 +0000)] 
Merge changes from CUPS 1.5svn-r9000.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1912 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r8950.
msweet [Thu, 14 Jan 2010 22:50:23 +0000 (22:50 +0000)] 
Merge changes from CUPS 1.5svn-r8950.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1816 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r8933.
msweet [Wed, 16 Dec 2009 00:13:28 +0000 (00:13 +0000)] 
Merge changes from CUPS 1.5svn-r8933.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1788 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r8916.
msweet [Wed, 9 Dec 2009 18:36:59 +0000 (18:36 +0000)] 
Merge changes from CUPS 1.5svn-r8916.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1766 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r8857.
msweet [Sat, 7 Nov 2009 06:21:32 +0000 (06:21 +0000)] 
Merge changes from CUPS 1.5svn-r8857.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1736 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoRemove old file.
msweet [Thu, 15 Oct 2009 21:28:49 +0000 (21:28 +0000)] 
Remove old file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1727 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r8849.
msweet [Thu, 15 Oct 2009 18:50:47 +0000 (18:50 +0000)] 
Merge changes from CUPS 1.5svn-r8849.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1725 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r8842.
msweet [Wed, 7 Oct 2009 18:20:31 +0000 (18:20 +0000)] 
Merge changes from CUPS 1.5svn-r8842.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1709 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.5svn-r8829.
msweet [Thu, 24 Sep 2009 23:50:39 +0000 (23:50 +0000)] 
Merge changes from CUPS 1.5svn-r8829.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1695 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoImport changes from CUPS 1.4.1 (r8801)
msweet [Sat, 29 Aug 2009 06:12:06 +0000 (06:12 +0000)] 
Import changes from CUPS 1.4.1 (r8801)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1649 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge final 1.4.0 (r8761) changes.
msweet [Fri, 7 Aug 2009 22:49:21 +0000 (22:49 +0000)] 
Merge final 1.4.0 (r8761) changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1629 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4.0 (r8756)
msweet [Tue, 14 Jul 2009 23:31:23 +0000 (23:31 +0000)] 
Merge changes from CUPS 1.4.0 (r8756)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1613 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4.0 (r8750)
msweet [Tue, 7 Jul 2009 18:36:58 +0000 (18:36 +0000)] 
Merge changes from CUPS 1.4.0 (r8750)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1608 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from 1.4.0 r8744.
msweet [Thu, 2 Jul 2009 19:16:48 +0000 (19:16 +0000)] 
Merge changes from 1.4.0 r8744.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1603 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from 1.4.0 (r8743)
msweet [Thu, 2 Jul 2009 15:21:10 +0000 (15:21 +0000)] 
Merge changes from 1.4.0 (r8743)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1595 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge fixes from CUPS 1.4.0 (r8739).
msweet [Wed, 1 Jul 2009 16:36:51 +0000 (16:36 +0000)] 
Merge fixes from CUPS 1.4.0 (r8739).

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1586 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8731 (1.4.0)
msweet [Fri, 26 Jun 2009 22:23:28 +0000 (22:23 +0000)] 
Merge changes from CUPS 1.4svn-r8731 (1.4.0)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1572 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8722 (tentative 1.4.0 GM)
msweet [Thu, 18 Jun 2009 22:32:02 +0000 (22:32 +0000)] 
Merge changes from CUPS 1.4svn-r8722 (tentative 1.4.0 GM)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1567 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoImport changes from CUPS 1.4svn-r8704.
msweet [Wed, 10 Jun 2009 19:02:58 +0000 (19:02 +0000)] 
Import changes from CUPS 1.4svn-r8704.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1556 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8681 (tentative CUPS 1.4rc1)
msweet [Fri, 22 May 2009 23:56:34 +0000 (23:56 +0000)] 
Merge changes from CUPS 1.4svn-r8681 (tentative CUPS 1.4rc1)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1537 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8679.
msweet [Fri, 22 May 2009 21:50:50 +0000 (21:50 +0000)] 
Merge changes from CUPS 1.4svn-r8679.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1531 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8659
msweet [Mon, 18 May 2009 22:09:10 +0000 (22:09 +0000)] 
Merge changes from CUPS 1.4svn-r8659

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1516 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8639.
msweet [Thu, 14 May 2009 22:48:33 +0000 (22:48 +0000)] 
Merge changes from CUPS 1.4svn-r8639.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1505 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoAdd missing man page file.
msweet [Thu, 14 May 2009 16:10:44 +0000 (16:10 +0000)] 
Add missing man page file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1499 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8628.
msweet [Wed, 13 May 2009 22:29:41 +0000 (22:29 +0000)] 
Merge changes from CUPS 1.4svn-r8628.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1495 a1ca3aef-8c08-0410-bb20-df032aa958be

14 years agoMerge changes from CUPS 1.4svn-r8606.
msweet [Fri, 8 May 2009 18:38:44 +0000 (18:38 +0000)] 
Merge changes from CUPS 1.4svn-r8606.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1480 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8540.
msweet [Wed, 22 Apr 2009 17:28:12 +0000 (17:28 +0000)] 
Merge changes from CUPS 1.4svn-r8540.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1432 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8492.
msweet [Wed, 8 Apr 2009 03:17:45 +0000 (03:17 +0000)] 
Merge changes from CUPS 1.4svn-r8492.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1378 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8469.
msweet [Wed, 25 Mar 2009 00:42:10 +0000 (00:42 +0000)] 
Merge changes from CUPS 1.4svn-r8469.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1338 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8454.
msweet [Wed, 18 Mar 2009 17:09:48 +0000 (17:09 +0000)] 
Merge changes from CUPS 1.4svn-r8454.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1311 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8443.
msweet [Fri, 13 Mar 2009 22:09:14 +0000 (22:09 +0000)] 
Merge changes from CUPS 1.4svn-r8443.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1296 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge more Common UNIX Printing System -> CUPS changes.
msweet [Mon, 9 Mar 2009 22:00:45 +0000 (22:00 +0000)] 
Merge more Common UNIX Printing System -> CUPS changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1286 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge trademark/logo changes from CUPS 1.4svn-r8418.
msweet [Mon, 9 Mar 2009 21:13:04 +0000 (21:13 +0000)] 
Merge trademark/logo changes from CUPS 1.4svn-r8418.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1283 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8414.
msweet [Sat, 7 Mar 2009 16:36:03 +0000 (16:36 +0000)] 
Merge changes from CUPS 1.4svn-r8414.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1277 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8394.
msweet [Wed, 25 Feb 2009 23:37:25 +0000 (23:37 +0000)] 
Merge changes from CUPS 1.4svn-r8394.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1253 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoRemove generated file.
msweet [Wed, 18 Feb 2009 17:49:06 +0000 (17:49 +0000)] 
Remove generated file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1234 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8362.
msweet [Tue, 17 Feb 2009 19:24:29 +0000 (19:24 +0000)] 
Merge changes from CUPS 1.4svn-r8362.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1228 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8346.
msweet [Wed, 11 Feb 2009 16:34:01 +0000 (16:34 +0000)] 
Merge changes from CUPS 1.4svn-r8346.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1212 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8329.
msweet [Wed, 4 Feb 2009 04:27:58 +0000 (04:27 +0000)] 
Merge changes from CUPS 1.4svn-r8329.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1182 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8305.
msweet [Thu, 29 Jan 2009 18:07:00 +0000 (18:07 +0000)] 
Merge changes from CUPS 1.4svn-r8305.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1166 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8290.
msweet [Fri, 23 Jan 2009 22:36:42 +0000 (22:36 +0000)] 
Merge changes from CUPS 1.4svn-r8290.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1144 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8252.
msweet [Wed, 14 Jan 2009 19:55:19 +0000 (19:55 +0000)] 
Merge changes from CUPS 1.4svn-r8252.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1123 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8227.
msweet [Fri, 9 Jan 2009 23:33:14 +0000 (23:33 +0000)] 
Merge changes from CUPS 1.4svn-r8227.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1113 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8196 (CUPS 1.4b2)
msweet [Mon, 15 Dec 2008 18:13:37 +0000 (18:13 +0000)] 
Merge changes from CUPS 1.4svn-r8196 (CUPS 1.4b2)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1100 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8177 (tentative CUPS 1.4b2)
msweet [Thu, 11 Dec 2008 01:40:30 +0000 (01:40 +0000)] 
Merge changes from CUPS 1.4svn-r8177 (tentative CUPS 1.4b2)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1090 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8177.
msweet [Mon, 8 Dec 2008 23:45:00 +0000 (23:45 +0000)] 
Merge changes from CUPS 1.4svn-r8177.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1084 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8162.
msweet [Sat, 6 Dec 2008 00:24:23 +0000 (00:24 +0000)] 
Merge changes from CUPS 1.4svn-r8162.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1079 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8148.
msweet [Wed, 19 Nov 2008 23:25:47 +0000 (23:25 +0000)] 
Merge changes from CUPS 1.4svn-r8148.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1068 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoIgnore generated testprint.
msweet [Fri, 14 Nov 2008 21:04:37 +0000 (21:04 +0000)] 
Ignore generated testprint.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1061 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8131.
msweet [Fri, 14 Nov 2008 21:04:14 +0000 (21:04 +0000)] 
Merge changes from CUPS 1.4svn-r8131.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1060 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8115.
msweet [Wed, 12 Nov 2008 01:01:46 +0000 (01:01 +0000)] 
Merge changes from CUPS 1.4svn-r8115.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1055 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8088, the real official 1.4b1!
msweet [Mon, 27 Oct 2008 21:56:38 +0000 (21:56 +0000)] 
Merge changes from CUPS 1.4svn-r8088, the real official 1.4b1!

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1035 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8067 (tentative CUPS 1.4b1)
msweet [Fri, 17 Oct 2008 22:12:14 +0000 (22:12 +0000)] 
Merge changes from CUPS 1.4svn-r8067 (tentative CUPS 1.4b1)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1021 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge CUPS 1.4svn-r8058 (tentative CUPS 1.4b1)
msweet [Wed, 15 Oct 2008 21:06:58 +0000 (21:06 +0000)] 
Merge CUPS 1.4svn-r8058 (tentative CUPS 1.4b1)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1016 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoDoco updates from CUPS 1.4svn-r8054.
msweet [Mon, 13 Oct 2008 17:16:02 +0000 (17:16 +0000)] 
Doco updates from CUPS 1.4svn-r8054.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1013 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoAdd missing file.
msweet [Fri, 10 Oct 2008 21:06:56 +0000 (21:06 +0000)] 
Add missing file.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1011 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge CUPS 1.4svn-r8052 (tentative 1.4b1)
msweet [Fri, 10 Oct 2008 21:00:18 +0000 (21:00 +0000)] 
Merge CUPS 1.4svn-r8052 (tentative 1.4b1)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1009 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoAdd missing files from r8033.
msweet [Wed, 8 Oct 2008 22:53:46 +0000 (22:53 +0000)] 
Add missing files from r8033.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1004 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r8033.
msweet [Wed, 8 Oct 2008 22:50:16 +0000 (22:50 +0000)] 
Merge changes from CUPS 1.4svn-r8033.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1003 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoAdd missing image.
msweet [Thu, 2 Oct 2008 00:59:36 +0000 (00:59 +0000)] 
Add missing image.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@995 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r7999.
msweet [Thu, 2 Oct 2008 00:56:58 +0000 (00:56 +0000)] 
Merge changes from CUPS 1.4svn-r7999.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@993 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r7994.
msweet [Mon, 29 Sep 2008 17:17:42 +0000 (17:17 +0000)] 
Merge changes from CUPS 1.4svn-r7994.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@989 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from 1.4svn-r7979.
msweet [Wed, 24 Sep 2008 21:31:49 +0000 (21:31 +0000)] 
Merge changes from 1.4svn-r7979.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@983 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r7961.
msweet [Wed, 17 Sep 2008 19:54:07 +0000 (19:54 +0000)] 
Merge changes from CUPS 1.4svn-r7961.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@969 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r7932.
msweet [Wed, 10 Sep 2008 22:30:50 +0000 (22:30 +0000)] 
Merge changes from CUPS 1.4svn-r7932.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@957 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoImport CUPS 1.4svn-r7908.
msweet [Thu, 4 Sep 2008 17:09:47 +0000 (17:09 +0000)] 
Import CUPS 1.4svn-r7908.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@943 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r7874.
msweet [Thu, 28 Aug 2008 22:58:28 +0000 (22:58 +0000)] 
Merge changes from CUPS 1.4svn-r7874.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@933 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r7874.
msweet [Wed, 27 Aug 2008 22:04:19 +0000 (22:04 +0000)] 
Merge changes from CUPS 1.4svn-r7874.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@924 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoAdd missing file.`
msweet [Tue, 26 Aug 2008 03:55:07 +0000 (03:55 +0000)] 
Add missing file.`

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@922 a1ca3aef-8c08-0410-bb20-df032aa958be

15 years agoMerge changes from CUPS 1.4svn-r7864.
msweet [Tue, 26 Aug 2008 03:49:44 +0000 (03:49 +0000)] 
Merge changes from CUPS 1.4svn-r7864.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@921 a1ca3aef-8c08-0410-bb20-df032aa958be