summaryrefslogtreecommitdiff
path: root/berkeley
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-06-27 20:26:20 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2008-06-27 20:26:20 +0000
commit75bd9771f6e44fdd887ee90faac46f403aefc0fc (patch)
tree354e3067522df9490e905772f73b72bfed8733ae /berkeley
parentdd1abb6b5f145c5e5f279d8848b5f3ec161fd227 (diff)
downloadcups-75bd9771f6e44fdd887ee90faac46f403aefc0fc.tar.gz
Merge changes from CUPS 1.4svn-r7696.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@818 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'berkeley')
-rw-r--r--berkeley/Makefile4
-rw-r--r--berkeley/lpc.c4
-rw-r--r--berkeley/lpq.c4
-rw-r--r--berkeley/lprm.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/berkeley/Makefile b/berkeley/Makefile
index 7531c01dd..7852f245f 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
#
# Berkeley commands makefile for the Common UNIX Printing System (CUPS).
#
@@ -153,5 +153,5 @@ include Dependencies
#
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
#
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index 947186782..a18eb0e71 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,5 +1,5 @@
/*
- * "$Id: lpc.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $"
*
* "lpc" command for the Common UNIX Printing System (CUPS).
*
@@ -450,5 +450,5 @@ show_status(http_t *http, /* I - HTTP connection to server */
/*
- * End of "$Id: lpc.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $".
*/
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 7ffb2a8e9..db089867e 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
/*
- * "$Id: lpq.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $"
*
* "lpq" command for the Common UNIX Printing System (CUPS).
*
@@ -667,5 +667,5 @@ usage(void)
/*
- * End of "$Id: lpq.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $".
*/
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index d00372c55..eeeca538b 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,5 +1,5 @@
/*
- * "$Id: lprm.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $"
*
* "lprm" command for the Common UNIX Printing System (CUPS).
*
@@ -223,5 +223,5 @@ main(int argc, /* I - Number of command-line arguments */
/*
- * End of "$Id: lprm.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $".
*/