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

[bpostle]

commit 8e664a3c8f334e119a282025053ac01b60e1c7a7
Merge: 20be1f0 b8b70b3
Author: Bruno Postle <bruno at postle.net>
Date:   Sun Dec 15 12:00:08 2013 +0000

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

 hugin.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc hugin.spec
index 996e22a,6125ed2..e6f4c5b
--- a/hugin.spec
+++ b/hugin.spec
@@@ -2,7 -2,7 +2,7 @@@
  Summary: A panoramic photo stitcher and more
  Name: hugin
  Version: 2013.0.0
- Release: 2%{?dist}
 -Release: 4%{?dist}
++Release: 5%{?dist}
  License: GPLv2+
  Group: Applications/Multimedia
  Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
@@@ -175,9 -173,15 +175,18 @@@ touch --no-create %{_datadir}/icons/gno
  %{_mandir}/man1/geocpset.*
  
  %changelog
- * Sun Dec 15 2013 Bruno Postle <bruno at postle.net> - 2013.0.0-2
++* Sun Dec 15 2013 Bruno Postle <bruno at postle.net> - 2013.0.0-5
 +- fix to re-enable .pto file association
 +
+ * Tue Dec 03 2013 Rex Dieter <rdieter at fedoraproject.org> - 2013.0.0-4
+ - rebuild (exiv2)
+ 
+ * Wed Nov 27 2013 Rex Dieter <rdieter at fedoraproject.org> - 2013.0.0-3
+ - rebuild (openexr)
+ 
+ * Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 2013.0.0-2
+ - rebuilt for GLEW 1.10
+ 
  * Thu Oct 31 2013 Bruno Postle <bruno at postle.net> - 2013.0.0-1
  - upstream stable release