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

[Miro Hrončok]

commit 3c1bcf1094d090929896d51ccf1d6fb0dce0cc23
Merge: 6e56f7a 9f97faf
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Aug 27 19:52:33 2013 +0200

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

 repsnapper.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc repsnapper.spec
index bab393c,efd77ce..a8abbe5
--- a/repsnapper.spec
+++ b/repsnapper.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           repsnapper
  Version:        2.2.0
- Release:        0.4.b3%{?dist}
 -Release:        0.5.a4%{?dist}
++Release:        0.6.b3%{?dist}
  Summary:        RepRap control software
  
  # repsnapper is GPLv2 as noted in licensing.txt
@@@ -95,10 -95,12 +95,16 @@@ f
  %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
  
  %changelog
- * Tue Aug 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2.2.0-0.4.b3
++* Tue Aug 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2.2.0-0.6.b3
 +- New upstream betaversion
 +- Rebuild for new lmfit
 +
+ * Wed Aug 21 2013 Remi Collet <rcollet at redhat.com> - 2.2.0-0.5.a4
+ - rebuild for new libzip
+ 
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-0.4.a4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Tue Jun 25 2013 Miro Hrončok <mhroncok at redhat.com> - 2.2.0-0.3.a4
  - Rebuilt for new polyclipping