[hplip: 3/3] Merge branch 'f18' into f19

Tue Apr 9 11:08:44 UTC 2013

commit 383bf7a2cf6a81d43075378c71bdabd2c76c30e6
Merge: 6944f55 a73541a
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Apr 9 12:53:41 2013 +0200

    Merge branch 'f18' into f19

 .gitignore                 |    1 +
 hplip-3.13.3.tar.gz.asc    |    7 -
 hplip-3.13.4.tar.gz.asc    |    7 +
 hplip-dbglog-newline.patch |   38 ++--
 hplip-deviceIDs-drv.patch  |  738 ++++++++++++++++++++++----------------------
 hplip-deviceIDs-ppd.patch  |  412 ++++++++++++------------
 hplip-logdir.patch         |   65 ++--
 hplip-snmp-quirks.patch    |   14 +-
 hplip.spec                 |    7 +-
 sources                    |    2 +-
 10 files changed, 648 insertions(+), 643 deletions(-)
---