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

[Hedayat Vatankhah]

commit 2c4eb9d8513537671d97407f721b8cacd2934177
Merge: 5dcd5c0 27afc28
Author: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date:   Tue Jun 5 00:19:15 2012 +0430

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

 rcssserver.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc rcssserver.spec
index bbe1964,50d7381..b020f2a
--- a/rcssserver.spec
+++ b/rcssserver.spec
@@@ -93,10 -101,9 +93,13 @@@ desktop-file-install --vendor="fedora
  %{_datadir}/applications/*
  
  %changelog
 +* Mon Jun 04 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 15.1.0-1
 +- Update to version 15.1.0
 +- Remove some no-longer-necessary lines (e.g. buildroot tag)
 +
+ * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.0.0-6
+ - Rebuilt for c++ ABI breakage
+ 
  * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.0.0-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild