From: Michael Sweet <msweet@msweet-imac.local>
Date: Tue, 15 Mar 2016 14:54:13 +0000 (-0400)
Subject: Merge branch 'branch-2.1' of https://github.com/michaelrsweet/cups into branch-2.1
X-Git-Tag: release-2.1.4~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1f200bb7575c13075c2844ba573153f150ae015;p=thirdparty%2Fcups.git

Merge branch 'branch-2.1' of https://github.com/michaelrsweet/cups into branch-2.1
---

b1f200bb7575c13075c2844ba573153f150ae015
diff --cc .gitignore
index 0000000000,0000000000..1a00a39045
new file mode 100644
--- /dev/null
+++ b/.gitignore
@@@ -1,0 -1,0 +1,6 @@@
++autom4te.cache
++config.h
++config.log
++config.status
++cups-config
++Makedefs