diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-26 19:37:04 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-26 19:37:04 +0000 |
commit | c41769ffd04ad45bb2c95691ad3999674896a2ed (patch) | |
tree | 550981cc16f46b17c991aaab2a0c520ba1333f86 /conf/Makefile | |
parent | a469f8a57669e1948d5cc29005d8c097312de63a (diff) | |
download | cups-c41769ffd04ad45bb2c95691ad3999674896a2ed.tar.gz |
Merge changes from CUPS 1.7svn-r10710.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4040 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf/Makefile')
-rw-r--r-- | conf/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/Makefile b/conf/Makefile index 5114174f1..a68a58b16 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -19,7 +19,7 @@ include ../Makedefs # Config files... # -KEEP = cupsd.conf snmp.conf +KEEP = cups-files.conf cupsd.conf snmp.conf REPLACE = mime.convs mime.types |