[ksaneplugin/f18: 7/7] Merge branch 'master' into f18

[Rex Dieter]

commit c362aa176f93ff095a701e6a5d014fb289271079
Merge: 6a517cb c539d04
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 10:17:00 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	ksaneplugin.spec
    	sources

 .gitignore       |    4 ++++
 ksaneplugin.spec |   24 ++++++++++++++++++++++++
 sources          |    4 ++++
 3 files changed, 32 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 8cb71d7,63347d9..3bce6e7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,6 -1,1 +1,10 @@@
++<<<<<<< HEAD
 +/ksaneplugin-4.8.5.tar.xz
 +/ksaneplugin-4.9.1.tar.xz
 +/ksaneplugin-4.9.2.tar.xz
 +/ksaneplugin-4.9.3.tar.xz
 +/ksaneplugin-4.9.4.tar.xz
 +/ksaneplugin-4.9.5.tar.xz
++=======
+ /ksaneplugin-4.10.1.tar.xz
++>>>>>>> master
diff --cc ksaneplugin.spec
index 0b75031,3a93a17..144b1f3
--- a/ksaneplugin.spec
+++ b/ksaneplugin.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:    ksaneplugin
  Summary: KDE sane service 
++<<<<<<< HEAD
 +Version: 4.9.5
++=======
+ Version: 4.10.1
++>>>>>>> master
  Release: 1%{?dist}
  
  License: LGPLv2+
@@@ -51,8 -51,23 +55,28 @@@ make install/fast DESTDIR=%{buildroot} 
  
  
  %changelog
++<<<<<<< HEAD
 +* Sat Dec 29 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.5-1
 +- 4.9.5
++=======
+ * Sat Mar 02 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.1-1
+ - 4.10.1
+ 
+ * Fri Feb 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.0-1
+ - 4.10.0
+ 
+ * Tue Jan 22 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.98-1
+ - 4.9.98
+ 
+ * Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.97-1
+ - 4.9.97
+ 
+ * Thu Dec 20 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.95-1
+ - 4.9.95
+ 
+ * Tue Dec 04 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.90-1
+ - 4.9.90
++>>>>>>> master
  
  * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
  - 4.9.4
diff --cc sources
index 40a840e,04957f8..e502202
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +36a41c7046afa40f2dbbae5d67ffb505  ksaneplugin-4.9.5.tar.xz
++=======
+ 2d07f8f5ebacc3fc1342bbe40261f9aa  ksaneplugin-4.10.1.tar.xz
++>>>>>>> master