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

[Pavel Alexeev]

commit 0f8ca396e6e2ee661c7f3cdb057f118c6f92b9b3
Merge: 4e6f135 1dbe950
Author: Hubbitus <pahan at hubbitus.info>
Date:   Mon Aug 18 17:32:51 2014 +0400

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

 fotoxx.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc fotoxx.spec
index 5abc1e7,bb872cf..04061f8
--- a/fotoxx.spec
+++ b/fotoxx.spec
@@@ -58,13 -54,14 +58,19 @@@ install -m 644 appdata/%{name}.appdata.
  %{_datadir}/%{name}
  %{_datadir}/applications/%{name}.desktop
  %{_datadir}/pixmaps/%{name}.png
 +%{_datadir}/appdata/
  
  %changelog
 +* Mon Aug 18 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 14.08-1
 +- Update to 14.08 - bz#1103438
 +- Install appdata dir.
 +
+ * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.05.1-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 14.05.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Mon May 12 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 14.05.1-1
  - Update to 14.05.1 - bz#1096062