[Commit-gnuradio] r10316 - in gnuradio/branches/releases/3.2: gnuradio-core gnuradio-examples gnuradio-examples/python gnuradio-examples/python/usrp gr-atsc gr-audio-alsa gr-audio-jack gr-audio-oss gr-audio-osx gr-audio-portaudio gr-audio-windows gr-comedi gr-gsm-fr-vocoder gr-msdd6000 gr-pager gr-radio-astronomy gr-trellis gr-usrp gr-video-sdl gr-wxgui gruel mblock pmt usrp usrp/doc usrp2/firmware/apps

[jcorgan]

Author: jcorgan
Date: 2009-01-27 11:04:46 -0700 (Tue, 27 Jan 2009)
New Revision: 10316

Removed:
   gnuradio/branches/releases/3.2/gnuradio-core/ChangeLog
   gnuradio/branches/releases/3.2/gnuradio-core/THANKS
   gnuradio/branches/releases/3.2/gnuradio-examples/ChangeLog
   gnuradio/branches/releases/3.2/gnuradio-examples/python/limbo/
   gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp/limbo/
   gnuradio/branches/releases/3.2/gr-atsc/ChangeLog
   gnuradio/branches/releases/3.2/gr-audio-alsa/AUTHORS
   gnuradio/branches/releases/3.2/gr-audio-alsa/ChangeLog
   gnuradio/branches/releases/3.2/gr-audio-jack/AUTHORS
   gnuradio/branches/releases/3.2/gr-audio-jack/ChangeLog
   gnuradio/branches/releases/3.2/gr-audio-oss/ChangeLog
   gnuradio/branches/releases/3.2/gr-audio-osx/AUTHORS
   gnuradio/branches/releases/3.2/gr-audio-osx/ChangeLog
   gnuradio/branches/releases/3.2/gr-audio-portaudio/AUTHORS
   gnuradio/branches/releases/3.2/gr-audio-portaudio/ChangeLog
   gnuradio/branches/releases/3.2/gr-audio-windows/AUTHORS
   gnuradio/branches/releases/3.2/gr-audio-windows/ChangeLog
   gnuradio/branches/releases/3.2/gr-comedi/AUTHORS
   gnuradio/branches/releases/3.2/gr-comedi/ChangeLog
   gnuradio/branches/releases/3.2/gr-gsm-fr-vocoder/AUTHORS
   gnuradio/branches/releases/3.2/gr-gsm-fr-vocoder/ChangeLog
   gnuradio/branches/releases/3.2/gr-msdd6000/AUTHORS
   gnuradio/branches/releases/3.2/gr-pager/AUTHORS
   gnuradio/branches/releases/3.2/gr-radio-astronomy/AUTHORS
   gnuradio/branches/releases/3.2/gr-radio-astronomy/ChangeLog
   gnuradio/branches/releases/3.2/gr-trellis/AUTHORS
   gnuradio/branches/releases/3.2/gr-trellis/ChangeLog
   gnuradio/branches/releases/3.2/gr-usrp/AUTHORS
   gnuradio/branches/releases/3.2/gr-usrp/ChangeLog
   gnuradio/branches/releases/3.2/gr-video-sdl/AUTHORS
   gnuradio/branches/releases/3.2/gr-video-sdl/ChangeLog
   gnuradio/branches/releases/3.2/gr-wxgui/ChangeLog
   gnuradio/branches/releases/3.2/gruel/AUTHORS
   gnuradio/branches/releases/3.2/gruel/ChangeLog
   gnuradio/branches/releases/3.2/mblock/AUTHORS
   gnuradio/branches/releases/3.2/mblock/ChangeLog
   gnuradio/branches/releases/3.2/pmt/AUTHORS
   gnuradio/branches/releases/3.2/pmt/ChangeLog
   gnuradio/branches/releases/3.2/usrp/AUTHORS
   gnuradio/branches/releases/3.2/usrp/ChangeLog
Modified:
   gnuradio/branches/releases/3.2/usrp/doc/Makefile.am
   gnuradio/branches/releases/3.2/usrp2/firmware/apps/Makefile.am
Log:
Merge r10315 from trunk into release 3.2 branch

Deleted: gnuradio/branches/releases/3.2/gnuradio-core/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gnuradio-core/THANKS

Deleted: gnuradio/branches/releases/3.2/gnuradio-examples/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-atsc/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-audio-alsa/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-audio-alsa/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-audio-jack/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-audio-jack/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-audio-oss/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-audio-osx/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-audio-osx/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-audio-portaudio/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-audio-portaudio/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-audio-windows/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-audio-windows/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-comedi/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-comedi/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-gsm-fr-vocoder/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-gsm-fr-vocoder/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-msdd6000/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-pager/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-radio-astronomy/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-radio-astronomy/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-trellis/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-trellis/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-usrp/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-usrp/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-video-sdl/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gr-video-sdl/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gr-wxgui/ChangeLog

Deleted: gnuradio/branches/releases/3.2/gruel/AUTHORS

Deleted: gnuradio/branches/releases/3.2/gruel/ChangeLog

Deleted: gnuradio/branches/releases/3.2/mblock/AUTHORS

Deleted: gnuradio/branches/releases/3.2/mblock/ChangeLog

Deleted: gnuradio/branches/releases/3.2/pmt/AUTHORS

Deleted: gnuradio/branches/releases/3.2/pmt/ChangeLog

Deleted: gnuradio/branches/releases/3.2/usrp/AUTHORS

Deleted: gnuradio/branches/releases/3.2/usrp/ChangeLog

Modified: gnuradio/branches/releases/3.2/usrp/doc/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/usrp/doc/Makefile.am 2009-01-27 18:00:05 UTC 
(rev 10315)
+++ gnuradio/branches/releases/3.2/usrp/doc/Makefile.am 2009-01-27 18:04:46 UTC 
(rev 10316)
@@ -56,7 +56,7 @@
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(docdir)
-       @for i in $(top_srcdir)/usrp/README $(top_srcdir)/usrp/ChangeLog; do \
+       @for i in $(top_srcdir)/usrp/README ; do \
                echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
        done

Modified: gnuradio/branches/releases/3.2/usrp2/firmware/apps/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.2/usrp2/firmware/apps/Makefile.am      
2009-01-27 18:00:05 UTC (rev 10315)
+++ gnuradio/branches/releases/3.2/usrp2/firmware/apps/Makefile.am      
2009-01-27 18:04:46 UTC (rev 10316)
@@ -61,3 +61,5 @@
 noinst_HEADERS = \
         app_common_v2.h \
         app_passthru_v2.h
+
+MOSTLYCLEANFILES = *.map