[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 95c9115a9cf6c744fbfca19e0a02cc9448267518
Merge: 2958d57 82b1e2e
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 12 15:14:34 2017 -0800

    Merge branch 'master' into next

 CMakeLists.txt                                |   1 +
 cmake/msvc/config.h                           |  21 +-
 cmake/msvc/inttypes.h                         | 301 --------------------------
 cmake/msvc/stdbool.h                          |  45 ----
 cmake/msvc/stdint.h                           | 251 ---------------------
 cmake/msvc/sys/time.h                         |   2 +
 gnuradio-runtime/include/gnuradio/block.h     |   2 +-
 gnuradio-runtime/include/gnuradio/unittests.h |   2 +
 gr-analog/grc/analog_probe_avg_mag_sqrd_x.xml |  17 ++
 gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc   |   4 +-
 grc/core/Port.py                              |   7 +-
 11 files changed, 33 insertions(+), 620 deletions(-)