[Commit-gnuradio] [gnuradio] branch master updated (67ab045 -> e876905)

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a change to branch master
in repository gnuradio.

      from  67ab045   Merge branch 'maint'
       new  7f84776   cmake: cmake doesn't have a FIND command for STRING until 
2.8.5, so we're just cehcking for that here before using it.
       new  475b9e0   trellis: updated examples.
       new  e20ba63   trellis: working on issue to fix locations of fsm files 
in examples.
       new  00edd3c   volk: calling enable_languages here is buggy until 
2.8.10. Version checking for that.
       new  94be0b4   trellis: minor fixups to trellis examples so prefix 
doesn't need to end with '/'.
       new  96c25b5   docs: added some cmake cli flags to better configure the 
build.
      adds  643ca36   blocks: correcting use of mutexes in file_meta_sink.
      adds  d1373fc   qtgui: fixed a bug in the constellation plots that didn't 
allow us to reduce the number of samples.
      adds  c1fb14a   qtgui: replaced use of local mutex with d_setlock from 
gr::block.
       new  e876905   Merge branch 'maint'

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 cmake/Modules/GrMiscUtils.cmake                    |   12 +-
 docs/doxygen/other/build_guide.dox                 |   52 +-
 gr-blocks/lib/file_meta_sink_impl.cc               |    6 +-
 gr-blocks/lib/file_meta_sink_impl.h                |    2 -
 gr-blocks/lib/file_meta_source_impl.cc             |    8 +-
 gr-blocks/lib/file_meta_source_impl.h              |    1 -
 gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h |    2 -
 gr-qtgui/lib/SpectrumGUIClass.cc                   |   60 +-
 gr-qtgui/lib/ber_sink_b_impl.h                     |    3 -
 gr-qtgui/lib/const_sink_c_impl.cc                  |    7 +-
 gr-qtgui/lib/const_sink_c_impl.h                   |    3 -
 gr-qtgui/lib/freq_sink_c_impl.cc                   |    4 +-
 gr-qtgui/lib/freq_sink_c_impl.h                    |    3 -
 gr-qtgui/lib/freq_sink_f_impl.cc                   |    4 +-
 gr-qtgui/lib/freq_sink_f_impl.h                    |    3 -
 gr-qtgui/lib/histogram_sink_f_impl.cc              |    4 +-
 gr-qtgui/lib/histogram_sink_f_impl.h               |    3 -
 gr-qtgui/lib/number_sink_impl.cc                   |    4 +-
 gr-qtgui/lib/number_sink_impl.h                    |    3 -
 gr-qtgui/lib/time_raster_sink_b_impl.h             |    1 -
 gr-qtgui/lib/time_raster_sink_f_impl.h             |    1 -
 gr-qtgui/lib/time_sink_c_impl.cc                   |   10 +-
 gr-qtgui/lib/time_sink_c_impl.h                    |    3 -
 gr-qtgui/lib/time_sink_f_impl.cc                   |   10 +-
 gr-qtgui/lib/time_sink_f_impl.h                    |    3 -
 gr-qtgui/lib/waterfall_sink_c_impl.cc              |    8 +-
 gr-qtgui/lib/waterfall_sink_c_impl.h               |    1 -
 gr-qtgui/lib/waterfall_sink_f_impl.cc              |    4 +
 gr-qtgui/lib/waterfall_sink_f_impl.h               |    1 -
 gr-trellis/examples/grc/CMakeLists.txt             |   37 +-
 .../examples/grc/interference_cancellation.grc     | 1673 ++++++++++++--------
 gr-trellis/examples/grc/pccc.grc                   |  653 ++++----
 gr-trellis/examples/grc/pccc1.grc                  |  781 ++++++---
 gr-trellis/examples/grc/sccc.grc                   |  611 +++----
 gr-trellis/examples/grc/sccc1.grc                  |  859 ++++++----
 gr-trellis/grc/trellis_encoder_xx.xml              |  135 +-
 .../grc/trellis_pccc_decoder_combined_xx.xml       |  316 ++--
 gr-trellis/grc/trellis_pccc_decoder_x.xml          |  210 +--
 gr-trellis/grc/trellis_pccc_encoder_xx.xml         |  178 ++-
 .../grc/trellis_sccc_decoder_combined_xx.xml       |  314 ++--
 gr-trellis/grc/trellis_sccc_decoder_x.xml          |  210 +--
 gr-trellis/grc/trellis_sccc_encoder_xx.xml         |  178 ++-
 gr-trellis/grc/trellis_siso_f.xml                  |  153 +-
 gr-trellis/grc/trellis_viterbi_combined_xx.xml     |  227 +--
 gr-trellis/grc/trellis_viterbi_x.xml               |  115 +-
 volk/lib/CMakeLists.txt                            |    6 +-
 46 files changed, 3959 insertions(+), 2923 deletions(-)