[Commit-gnuradio] [gnuradio] 18/23: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fda4cc86f457ac8f0fb84baeb06536a633f71ae5
Merge: 2d0b64b 8f1d6d2
Author: Johnathan Corgan <address@hidden>
Date:   Sat Nov 28 12:12:25 2015 -0800

    Merge branch 'maint'

 .../gnuradio/analog/frequency_modulator_fc.h       | 23 ++++++++++++++++++++++
 gr-digital/include/gnuradio/digital/crc32_bb.h     | 14 ++++++-------
 grc/gui/Port.py                                    |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)