[Commit-gnuradio] [gnuradio] 03/05: Merge remote-tracking branch 'gnuradio-wg-grc/next_grcwg' 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 f1f49ff9b18d5e4ebbee4ddd279244f562672e0f
Merge: 0dc8072 6fb0ff2
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 10 13:48:07 2016 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/next_grcwg' into next

 grc/blocks/parameter.xml           |  2 +-
 grc/core/Element.pyi               | 54 ++++++++++++++++++++++++++++++++++++++
 grc/core/generator/flow_graph.tmpl |  7 +++--
 grc/test/.cache/v/cache/lastfailed |  3 +++
 4 files changed, 63 insertions(+), 3 deletions(-)