[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4.1-1146-gae62560

[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  ae625607c22a0f4f775d70ac40e02ef3d5a04b35 (commit)
       via  894865eede58e6c2b42cbc30dd969658ac2365ca (commit)
       via  c639fd89346a9485f7cda041f84d3e26a79548bf (commit)
       via  bad3b840f0408d18082de5fca8ae5804a751a30d (commit)
       via  5cb0d3f04a6329cdb2c3443951185c8a3e5deba3 (commit)
       via  3f15981d084246287c6cf1cde77064b45e53d6b4 (commit)
       via  3e335ea4fc919f82c659db7cc388cd2ea415d3b3 (commit)
       via  bed4b5fe4c8e86d6dc9414758500a8187400750f (commit)
      from  555327f527b4bff7db57779bd96865d81fdfed88 (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 ae625607c22a0f4f775d70ac40e02ef3d5a04b35
Merge: 894865e c639fd8
Author: Tom Rondeau <address@hidden>
Date:   Mon Apr 15 21:44:28 2013 -0400

    Merge branch 'master' into next

commit 894865eede58e6c2b42cbc30dd969658ac2365ca
Merge: 5cb0d3f 555327f
Author: Tom Rondeau <address@hidden>
Date:   Mon Apr 15 21:44:16 2013 -0400

    Merge branch 'next' of gnuradio.org:gnuradio into next

commit 5cb0d3f04a6329cdb2c3443951185c8a3e5deba3
Merge: 183d6ee 3f15981
Author: Tom Rondeau <address@hidden>
Date:   Mon Apr 15 13:20:06 2013 -0400

    Merge branch 'next_fractional_resampler' into next

commit 3f15981d084246287c6cf1cde77064b45e53d6b4
Author: Tom Rondeau <address@hidden>
Date:   Fri Apr 12 23:39:54 2013 -0400

    filter: updated fractional_resampler for next. Also adding deprecated 
warning to fractional_interpolator.

commit 3e335ea4fc919f82c659db7cc388cd2ea415d3b3
Merge: c018b14 bed4b5f
Author: Tom Rondeau <address@hidden>
Date:   Fri Apr 12 23:12:04 2013 -0400

    Merge branch 'fractional_resampler' into next_fractional_resampler
    
    Conflicts:
        gr-filter/grc/CMakeLists.txt

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

Summary of changes:
 gr-blocks/lib/file_meta_source_impl.cc             |   14 ++++-
 gr-filter/grc/CMakeLists.txt                       |    1 +
 gr-filter/grc/filter_block_tree.xml                |    2 +-
 ...r_xx.xml => filter_fractional_resampler_xx.xml} |   14 +++---
 gr-filter/include/filter/CMakeLists.txt            |    2 +
 ...interpolator_ff.h => fractional_resampler_cc.h} |   26 +++++-----
 ...interpolator_ff.h => fractional_resampler_ff.h} |   26 +++++-----
 gr-filter/lib/CMakeLists.txt                       |    2 +
 gr-filter/lib/fractional_interpolator_cc_impl.cc   |    2 +
 gr-filter/lib/fractional_interpolator_ff_impl.cc   |    2 +
 ..._cc_impl.cc => fractional_resampler_cc_impl.cc} |   58 ++++++++++----------
 ...or_cc_impl.h => fractional_resampler_cc_impl.h} |   26 +++++-----
 ..._ff_impl.cc => fractional_resampler_ff_impl.cc} |   58 ++++++++++----------
 ...or_ff_impl.h => fractional_resampler_ff_impl.h} |   26 +++++-----
 ..._interpolator.py => qa_fractional_resampler.py} |    4 +-
 gr-filter/swig/filter_swig.i                       |    6 ++
 16 files changed, 146 insertions(+), 123 deletions(-)
 copy gr-filter/grc/{filter_fractional_interpolator_xx.xml => 
filter_fractional_resampler_xx.xml} (69%)
 copy gr-filter/include/filter/{fractional_interpolator_ff.h => 
fractional_resampler_cc.h} (61%)
 copy gr-filter/include/filter/{fractional_interpolator_ff.h => 
fractional_resampler_ff.h} (61%)
 copy gr-filter/lib/{fractional_interpolator_cc_impl.cc => 
fractional_resampler_cc_impl.cc} (54%)
 copy gr-filter/lib/{fractional_interpolator_cc_impl.h => 
fractional_resampler_cc_impl.h} (67%)
 copy gr-filter/lib/{fractional_interpolator_ff_impl.cc => 
fractional_resampler_ff_impl.cc} (53%)
 copy gr-filter/lib/{fractional_interpolator_ff_impl.h => 
fractional_resampler_ff_impl.h} (67%)
 copy gr-filter/python/{qa_fractional_interpolator.py => 
qa_fractional_resampler.py} (96%)
 mode change 100755 => 100644


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