[Commit-gnuradio] [gnuradio] 05/06: 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 d7f0b3c76e9e913b6c031f570e079ce9aa78a91a
Merge: 66df227 1799695
Author: Johnathan Corgan <address@hidden>
Date:   Fri Oct 28 11:05:45 2016 -0700

    Merge branch 'maint'

 cmake/Modules/GrPlatform.cmake                               |  8 ++++++++
 gnuradio-runtime/lib/pmt/pmt.cc                              | 12 +++++++++++-
 gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx   |  2 +-
 .../python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake  |  8 ++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)