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

[Miro Hrončok]

commit 14e3cdb00658a1201220b64172cf689ba42fea7b
Merge: cd92408 9c9b7cb
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Sat Dec 27 18:07:35 2014 +0100

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

 RepetierHost.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc RepetierHost.spec
index 3977fe1,536f426..67a1844
--- a/RepetierHost.spec
+++ b/RepetierHost.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           RepetierHost
  Version:        0.90D
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        3D printer control software
  License:        ASL 2.0
  URL:            http://www.repetier.com/
@@@ -76,9 -76,9 +76,12 @@@ chmod +x %{buildroot}%{_bindir}/%{name
  %{_datadir}/pixmaps/%{name}.ico
  
  %changelog
- * Sat Dec 27 2014 Miro Hrončok <mhroncok at redhat.com> - 0.90D-2
++* Sat Dec 27 2014 Miro Hrončok <mhroncok at redhat.com> - 0.90D-3
 +- Rebuilt for new OpenTK
 +
+ * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.90D-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Thu Sep 05 2013 Miro Hrončok <mhroncok at redhat.com> - 0.90D-1
  - New (sub)release that corrects several Linux issues including #1004561