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

[Jaroslav Škarvada]

commit b2e7aae352326053b1fb3109d185c11cdb3dc8f1
Merge: e510c1b 4d79f9e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Dec 2 00:52:11 2011 +0100

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

 gnuradio.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gnuradio.spec
index a40dd11,1db083c..272efae
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@@ -164,12 -175,9 +164,15 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/gnuradio/examples
  
  %changelog
 +* Tue Nov 01 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.5.0-0.1.rc0
 +- New pre-release version
 +- Followed upstream and dropped support for usrp, use uhd instead
 +- Dropped sdcc3 and libusb-detect-fix patches
 +- Dropped 10-usrp.rules and usrp group creation, now handled by uhd
 +
+ * Sun Nov 20 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-2
+ - Rebuilt for new boost
+ 
  * Thu Oct 27 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-1
  - New version
  - Dropped retval patch