[wifi-radar/f12/master] Update to 2.0.s08

[Pablo Martin-Gomez]

commit aac0a72eb6aca9c69f42db5df456428371d0b883
Author: bouska <bouska at fedoraproject.net>
Date:   Mon Nov 1 16:13:49 2010 +0100

    Update to 2.0.s08

 wifi-radar.spec |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/wifi-radar.spec b/wifi-radar.spec
index 8368855..4650205 100644
--- a/wifi-radar.spec
+++ b/wifi-radar.spec
@@ -1,9 +1,15 @@
 Name:		wifi-radar
 Summary:	A utility for managing WiFi profiles
+<<<<<<< HEAD
 Version:	1.9.9
 Release:	3%{?dist}
 # No version given.
 License:	GPL+
+=======
+Version:	2.0.s08
+Release:	1%{?dist}
+License:	GPLv2
+>>>>>>> d22b481... Update to 2.0.s08
 Group:		Applications/Internet
 URL:		http://wifi-radar.systemimager.org/
 Source0:	http://wifi-radar.systemimager.org/pub/wifi-radar-%{version}.tar.bz2
@@ -81,6 +87,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING DEVELOPER_GUIDELINES README TODO
 
 %changelog
+<<<<<<< HEAD
+=======
+* Mon Nov 01 2010 Pablo Martin-Gomez <bouska at fedoraproject.org> -2.0.s08-1
+- Update to 2.0.s08
+
+* Wed Oct 28 2009 Pablo Martin-Gomez <pablo.martin-gomez at laposte.net> - 2.0.s06-1
+- Update to 2.0.s06
+- Patch the source in order to be used on Fedora
+- The software can't be deamonize, so initscript is useless
+- Clean and recycle the spec file
+
+>>>>>>> d22b481... Update to 2.0.s08
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild