[kde-baseapps/f18: 11/11] Merge branch 'master' into f18

[Rex Dieter]

commit fc189a99169322461a3abbaae16105434f5839a5
Merge: 8fa9c03 18ba46c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 13:56:25 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kde-baseapps.spec
    	sources

 .gitignore        |    7 +--
 kde-baseapps.spec |  211 +++++++++--------------------------------------------
 sources           |    2 +-
 3 files changed, 37 insertions(+), 183 deletions(-)
---
diff --cc kde-baseapps.spec
index 237c6e3,edc773c..365ed3c
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@@ -1,6 -1,6 +1,10 @@@
  Name:    kde-baseapps
  Summary: KDE Core Applications 
++<<<<<<< HEAD
 +Version: 4.9.5
++=======
+ Version: 4.10.1
++>>>>>>> master
  Release: 1%{?dist}
  
  License: GPLv2
@@@ -270,11 -271,29 +275,37 @@@ f
  
  
  %changelog
++<<<<<<< HEAD
 +* Sat Dec 29 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.5-1
 +- 4.9.5
 +
 +* Mon Dec 10 2012 Than Ngo <than at redhat.com> - 4.9.4-2
 +- apply upstream patch to fix regression in dolphin
++=======
+ * Sat Mar 02 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-1
+ - 4.10.1
+ 
+ * Thu Jan 31 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.0-1
+ - 4.10.0
+ 
+ * Sun Jan 20 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
+ 
+ * Thu Dec 13 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-3
+ - Dolphin cannot start due to symbol lookup error (#886964)
+ 
+ * Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-2
+ - BR: kactivites-devel nepomuk-core-devel
+ 
+ * Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
+ - 4.9.90 (4.10 beta2)
++>>>>>>> master
  
  * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
  - 4.9.4