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

[Louis Lagendijk]

commit 8816bed1d107bf0d9a458dc3eb3e45de5b803787
Merge: 4fad25a b76af52
Author: Louis Lagendijk <louis at lagendijk.xs4all.nl>
Date:   Thu Sep 15 21:51:24 2011 +0200

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

 ffgtk.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --cc ffgtk.spec
index 17d9bbd,5a915bc..5ce7fac
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           ffgtk
  Version:        0.7.94
- Release:        6%{?dist}
 -Release:        7%{?dist}
++Release:        8%{?dist}
  Summary:        A solution for controlling Fritz!Box or compatible routers
  Group:          Applications/Communications
  License:        GPLv2
@@@ -173,10 -177,8 +173,12 @@@ f
  %{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0.0.0
  
  %changelog
- * Mon Aug 29 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.94-6
++* Mon Aug 29 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.94-8
 +- removed clean section
 +- remove ubuntu icons (fixes BZ 733934)
- - rebuild for dependencies on F16 and rawhide (libcamel and evolution)
++
+ * Tue Aug 30 2011 Milan Crha <mcrha at redhat.com> 0.7.94-7
+ - Rebuild against newer evolution-data-server
  
  * Wed Aug 17 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.94-6
  - rebuilt for evolution update