[sword/f13/master: 5/5] Merge branch 'master' into f13

Deji Akingunola deji at fedoraproject.org
Wed Oct 27 03:58:05 UTC 2010


commit 1df0a91d7e91a0a67466c0d3467c504fa1948978
Merge: ec62517 aa44d9a
Author: Deji Akingunola <dakingun at gmail.com>
Date:   Tue Oct 26 23:57:11 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sword.spec
    
    Update to 1.6.2

 .gitignore |    1 -
 sources    |    2 +-
 sword.spec |   11 ++++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --cc sword.spec
index a92172d,3cbf360..8aa5fd0
--- a/sword.spec
+++ b/sword.spec
@@@ -84,6 -82,12 +82,9 @@@ rm -rf %{buildroot
  %{_libdir}/libsword.so
  
  %changelog
 -* Fri Oct 22 2010 Deji Akingunola <dakingun at gmail.com> - 1.6.2-1
++* Tue Oct 26 2010 Deji Akingunola <dakingun at gmail.com> - 1.6.2-1
+ - Update to version 1.6.2
+ 
 -* Fri Apr 02 2010 Caolán McNamara <caolanm at redhat.com> - 1.6.1-3
 -- rebuild for icu 4.4
 -
  * Sat Mar 20 2010 Deji Akingunola <dakingun at gmail.com> - 1.6.1-2
  - Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685
  


More information about the scm-commits mailing list