[Commit-gnuradio] [gnuradio] branch master updated (31d2c32 -> 4ecc974)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  31d2c32   trellis: Port all GRC examples to QT
       new  3ce34d5   digital: deprecate correlate_and_sync
       new  4ecc974   Merge remote-tracking branch 
'github/deprecate-correlate-and-sync'

The 2 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:
 gr-digital/grc/digital_block_tree.xml                       | 1 -
 gr-digital/grc/digital_correlate_and_sync_cc.xml            | 1 +
 gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)