[hplip/f20: 2/2] Merge branch 'f19' into f20

[Jiří Popelka]

commit 39efc1aed250ef928cec972b7714b8f623fd007c
Merge: 6d7b6c9 d4d1997
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Oct 7 16:08:36 2014 +0200

    Merge branch 'f19' into f20

 .gitignore                |    1 +
 hplip-3.14.10.tar.gz.asc  |    7 +
 hplip-3.14.6.tar.gz.asc   |    7 -
 hplip-deviceIDs-drv.patch |  298 ++++++++++++++++++++++----------------------
 hplip-udev-rules.patch    |   21 ++--
 hplip.spec                |    7 +-
 sources                   |    2 +-
 7 files changed, 174 insertions(+), 169 deletions(-)
---
diff --cc hplip.spec
index 287960d,66afe0f..80e8f68
--- a/hplip.spec
+++ b/hplip.spec
@@@ -488,9 -492,9 +488,12 @@@ rm -f %{buildroot}%{_sysconfdir}/xdg/au
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Tue Oct 07 2014 Jiri Popelka <jpopelka at redhat.com> - 3.14.10-1
+ - 3.14.10
+ 
 +* Tue Aug 26 2014 Tim Waugh <twaugh at redhat.com> - 3.14.6-7
 +- Reverted previous change as it didn't help (bug #1076954).
 +
  * Wed Jul 23 2014 Tim Waugh <twaugh at redhat.com> - 3.14.6-6
  - Potential fix for lineart scanning (bug #1076954).