summaryrefslogtreecommitdiff
path: root/conf/Makefile
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-12-12 20:54:21 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-12-12 20:54:21 +0000
commitc1420c8744235de1249c34b956b7c11ccafd659d (patch)
tree27879336dd313e589eb2004964f2af416520daff /conf/Makefile
parentc41769ffd04ad45bb2c95691ad3999674896a2ed (diff)
downloadcups-c1420c8744235de1249c34b956b7c11ccafd659d.tar.gz
Merge changes from CUPS 1.7svn-r10755.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4074 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf/Makefile')
-rw-r--r--conf/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/Makefile b/conf/Makefile
index a68a58b16..04cc1e739 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -3,7 +3,7 @@
#
# Configuration file makefile for CUPS.
#
-# Copyright 2007-2011 by Apple Inc.
+# Copyright 2007-2012 by Apple Inc.
# Copyright 1993-2006 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the