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

[Hedayat Vatankhah]

commit 53e7487420ab8f53023daa8e17f44d3adb8c07af
Merge: dcd285c 9bb8e87
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Fri Jul 22 17:40:49 2011 +0430

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

 ax_boost_base-64bit.patch |   13 +++++++++++++
 rcsslogplayer.spec        |   10 ++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --cc rcsslogplayer.spec
index 6a0ed84,5678b7a..31fa132
--- a/rcsslogplayer.spec
+++ b/rcsslogplayer.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           rcsslogplayer
  Version:        15.0.0
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        RoboCup Soccer Simulator LogPlayer
  Group:          Applications/System
  
@@@ -85,9 -88,9 +88,12 @@@ rm -rf %{buildroot
  %{_libdir}/*.so
  
  %changelog
- * Fri Jul 22 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.0.0-2
++* Fri Jul 22 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.0.0-3
 +- Rebuild for Boost 1.47
 +
+ * Fri May 27 2011 Dan Horák <dan[at]danny.cz> - 15.0.0-2
+ - fix build on non-x86 64-bit architectures
+ 
  * Thu May 19 2011 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.0.0-1
  - Updated to upstream version 15.0.0