[gupnp-tools/f16: 4/4] fix merge

[Peter Robinson]

commit a5e6ef3c5e117ef825398cc0eefc65207799f6f6
Merge: 5bba1f3 63907ca
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 12 12:21:03 2011 +0000

    fix merge

 .gitignore               |    5 +---
 gupnp-tools-fixdso.patch |   11 ---------
 gupnp-tools.spec         |   54 ++++++++++++++++++++++++---------------------
 sources                  |    2 +-
 4 files changed, 31 insertions(+), 41 deletions(-)
---
diff --cc gupnp-tools.spec
index 5238cf6,42d608c..62b9f1d
--- a/gupnp-tools.spec
+++ b/gupnp-tools.spec
@@@ -1,6 -1,6 +1,11 @@@
  Name:          gupnp-tools
++<<<<<<< HEAD
 +Version:       0.8.3
 +Release:       3%{?dist}
++=======
+ Version:       0.8.4
+ Release:       1%{?dist}
++>>>>>>> master
  Summary:       A collection of dev tools utilising GUPnP and GTK+
  
  Group:         System Environment/Libraries
@@@ -72,16 -67,20 +72,20 @@@ desktop-file-install --vendor=gupnp 
  %{_datadir}/gupnp-tools/*.ui
  
  %changelog
+ * Mon Dec 12 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.4-1
+ - Update to 0.8.4
+ - http://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.8/gupnp-tools-0.8.4.news
+ 
 -* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.8.3-3
 -- Rebuild for new libpng
 +* Tue Sep  6 2011 Zeeshan Ali <zeenix at redhat.com> 0.8.3-3
 +- Rebuild for new gupnp/gssdp
  
- * Fri Jun 17 2011 Peter Robinson <pbrobinson at gmail.com> 0.8.3-2
+ * Fri Jun 17 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.3-2
  - rebuild for new gupnp/gssdp
  
- * Fri Apr 15 2011 Peter Robinson <pbrobinson at gmail.com> 0.8.3-1
+ * Fri Apr 15 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.3-1
  - Update to 0.8.3
  
- * Mon Apr 11 2011 Peter Robinson <pbrobinson at gmail.com> 0.8.2-1
+ * Mon Apr 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.2-1
  - Update to 0.8.2
  
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3