[bibletime: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/bibletime

[Greg Hellings]

commit c4b88d92dc371d90a7453eac737b2e03adaea230
Merge: b55ece4 67314d8
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Mon Jul 7 23:06:54 2014 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/bibletime
    
    Conflicts:
    	bibletime.spec

 bibletime.spec |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc bibletime.spec
index f52d1ff,c04a523..6fb7fc3
--- a/bibletime.spec
+++ b/bibletime.spec
@@@ -74,10 -74,15 +74,19 @@@ desktop-file-validate %{buildroot}%{_da
  %doc ChangeLog README LICENSE
  
  %changelog
 +* Mon Jul 07 2014 Greg Hellings <greg.hellings at gmail.com> - 2.10.1-1
 +- New upstream release
 +- Should address bug #1113320
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
+ * Thu May 22 2014 Petr Machata <pmachata at redhat.com> - 2.10.0-3
+ - Rebuild for boost 1.55.0
+ 
+ * Mon May 19 2014 Deji Akingunola <dakingun at gmail.com> - 2.10.0-2
+ - Rebuild for sword-1.7.3
+ 
  * Wed Jan 29 2014 Greg Hellings <greg.hellings at gmail.com> - 2.10.0-1
  - Updated to bibletime-2.10.0