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

[Louis Lagendijk]

commit 3d986f66d82f28051f02ec449fe37844aaf1dd65
Merge: f125e07 57591d1
Author: Louis Lagendijk <louis at lagendijk.xs4all.nl>
Date:   Sat Jun 25 15:15:26 2011 +0200

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

 ffgtk.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ffgtk.spec
index 933e30f,63e7637..2c1560f
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@@ -176,15 -181,8 +176,18 @@@ rm -rf %{buildroot
  %{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0.0.0
  
  %changelog
 +* Mon Jun 13 2011  Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.94-1
 +- new upstream release
 +- Voxbox support removes the need for libcapifax
 +- plugin-capifax package removed
 +- Fax  printing support moved to main package (capifax plugin will be
 +  removed in a later release
 +- removed -Werror patch as it is no longer required
 +- removed libexec patch as there is no longer an external command
 +
+ * Mon May 16 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.8-5
+ - Rebuilt for new evolution-dataserver
++
  * Thu Feb 10 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.8-4
  - Remove -Werror from Makefile,am for now as it breaks compilation under RwaHide
    as -Wunused-but-set-parameter seems to be standard now