From b19ccc9e271691cc71a08e9968c58f464ebeade5 Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 17 Sep 2008 19:54:07 +0000
Subject: 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
---
 berkeley/Makefile | 4 ++--
 berkeley/lpr.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'berkeley')

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 996858d38..346bc17fd 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -161,5 +161,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index b529365d7..2e30bc310 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpr.c 7170 2008-01-04 02:21:30Z mike $"
+ * "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $"
  *
  *   "lpr" command for the Common UNIX Printing System (CUPS).
  *
@@ -427,5 +427,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lpr.c 7170 2008-01-04 02:21:30Z mike $".
+ * End of "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $".
  */
-- 
cgit v1.2.1