diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/cups/patches/patch-scheduler_auth_c | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/cups/patches/patch-scheduler_auth_c')
| -rw-r--r-- | package/cups/patches/patch-scheduler_auth_c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package/cups/patches/patch-scheduler_auth_c b/package/cups/patches/patch-scheduler_auth_c index c1f3a3e94..d9892c206 100644 --- a/package/cups/patches/patch-scheduler_auth_c +++ b/package/cups/patches/patch-scheduler_auth_c @@ -1,7 +1,6 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cups-1.3.10.orig/scheduler/auth.c 2009-02-07 06:06:11.000000000 +0100 -+++ cups-1.3.10/scheduler/auth.c 2009-06-01 19:17:20.000000000 +0200 -@@ -54,6 +54,7 @@ +--- cups-1.4.2.orig/scheduler/auth.c 2009-05-27 00:01:23.000000000 +0200 ++++ cups-1.4.2/scheduler/auth.c 2009-12-30 12:30:13.000000000 +0100 +@@ -57,6 +57,7 @@ * Include necessary headers... */ |