[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'bistromath/msk_only'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 676d5cbe64f0b1293797025e5c4460f1e79896dc
Merge: 69c73b8 a96e06b
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 15 13:19:57 2015 -0700

    Merge remote-tracking branch 'bistromath/msk_only'

 gr-digital/grc/digital_msk_timing_recovery_cc.xml  |  49 +++++
 gr-digital/include/gnuradio/digital/CMakeLists.txt |   1 +
 .../gnuradio/digital/msk_timing_recovery_cc.h      |  76 ++++++++
 gr-digital/lib/CMakeLists.txt                      |   1 +
 gr-digital/lib/msk_timing_recovery_cc_impl.cc      | 210 +++++++++++++++++++++
 gr-digital/lib/msk_timing_recovery_cc_impl.h       |  72 +++++++
 gr-digital/swig/digital_swig.i                     |   3 +
 7 files changed, 412 insertions(+)