[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.2-449-g9f376ff

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, next has been updated
       via  9f376ff32edd2e0d0132029111c9bdff9654d1b2 (commit)
       via  747b6702a112ccb4644904e1c965221c2de157f8 (commit)
       via  c5436ca8ddab5fa77a585c8f00743bb85a93c59a (commit)
      from  49dadf282dff3ab144ced916add4ef148b7378ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f376ff32edd2e0d0132029111c9bdff9654d1b2
Merge: 49dadf2 747b670
Author: Johnathan Corgan <address@hidden>
Date:   Fri Nov 2 10:06:09 2012 -0700

    Merge branch 'master' into next
    
    Conflicts are from moving gr_channel_model into
    filter::channel_model.
    
    Conflicts:
        gnuradio-core/src/lib/hier/gr_channel_model.h
        gnuradio-core/src/lib/hier/gr_channel_model.i
        gr-digital/examples/narrowband/benchmark_add_channel.py
        gr-digital/examples/ofdm/benchmark_add_channel.py

-----------------------------------------------------------------------

Summary of changes:
 .../examples/narrowband/benchmark_add_channel.py   |    3 ++-
 gr-digital/examples/ofdm/benchmark_add_channel.py  |    3 ++-
 gr-filter/include/filter/channel_model.h           |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
git://gnuradio.org/gnuradio