summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-05-12 06:22:31 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2011-05-12 06:22:31 +0000
commit321d8d57dacf00e4ae19558dc9444519f4d9ade1 (patch)
tree6f07778268fd2099c235dd4d2f2d4aa38fcb0110 /conf
parenteac3a0a01bf37d95f4129b28296cb697c54b2613 (diff)
downloadcups-321d8d57dacf00e4ae19558dc9444519f4d9ade1.tar.gz
Merge changes from CUPS 1.5b1-r9774.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3247 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r--conf/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/Makefile b/conf/Makefile
index 4e3963e21..5114174f1 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,9 +1,9 @@
#
# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $"
#
-# Configuration file makefile for the Common UNIX Printing System (CUPS).
+# Configuration file makefile for CUPS.
#
-# Copyright 2007-2008 by Apple Inc.
+# Copyright 2007-2011 by Apple Inc.
# Copyright 1993-2006 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the