summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2013-06-12 14:23:32 +0200
committerDidier Raboud <odyx@debian.org>2013-06-12 14:23:32 +0200
commit6b7ae334dc7e1350c89247a3aea31c844128b970 (patch)
tree07473a9c942897c8ae5c29048e9a29dddca96e07 /conf
parentea5667a811b20e235ce1975e763469edd1f7f0de (diff)
downloadcups-6b7ae334dc7e1350c89247a3aea31c844128b970.tar.gz
Imported Upstream version 1.7~b1upstream/1.7_b1
Diffstat (limited to 'conf')
-rw-r--r--conf/Makefile6
-rw-r--r--conf/cups-files.conf.in4
-rw-r--r--conf/cupsd.conf.in4
3 files changed, 7 insertions, 7 deletions
diff --git a/conf/Makefile b/conf/Makefile
index 7da088b1..c00b6970 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,9 +1,9 @@
#
-# "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $"
+# "$Id: Makefile 10726 2012-12-04 18:38:31Z mike $"
#
# 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
@@ -139,5 +139,5 @@ uninstall:
#
-# End of "$Id: Makefile 10710 2012-11-26 18:26:01Z mike $".
+# End of "$Id: Makefile 10726 2012-12-04 18:38:31Z mike $".
#
diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
index be5df620..4ef8839a 100644
--- a/conf/cups-files.conf.in
+++ b/conf/cups-files.conf.in
@@ -1,5 +1,5 @@
#
-# "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $"
+# "$Id: cups-files.conf.in 10764 2012-12-13 20:36:08Z mike $"
#
# Sample file/directory/user/group configuration file for the CUPS scheduler.
# See "man cups-files.conf" for a complete description of this file.
@@ -94,5 +94,5 @@ PageLog @CUPS_LOGDIR@/page_log
#TempDir @CUPS_REQUESTS@/tmp
#
-# End of "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $".
+# End of "$Id: cups-files.conf.in 10764 2012-12-13 20:36:08Z mike $".
#
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 256c1e21..27f452f8 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
#
-# "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $"
+# "$Id: cupsd.conf.in 10709 2012-11-26 18:25:58Z mike $"
#
# Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a
# complete description of this file.
@@ -130,5 +130,5 @@ WebInterface @CUPS_WEBIF@
</Policy>
#
-# End of "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $".
+# End of "$Id: cupsd.conf.in 10709 2012-11-26 18:25:58Z mike $".
#