[Commit-gnuradio] [gnuradio] branch master updated (a7285ea -> 0f61e4e)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  a7285ea   Merge branch 'maint'
       new  6228e9b   scheduler: fix doc
       new  49e1f51   grc: random block placement to account for small canvas 
vs screen size
       new  7ffc414   Merge remote-tracking branch 
'gnuradio-wg-grc/maint_grcwg' into maint
       new  c62b9f7   Merge branch 'maint'
       new  d8d3b8c   Merge branch 'maint_grcwg' into master_grcwg
       new  5ac3233   Merge remote-tracking branch 
'gnuradio-wg-grc/master_grcwg'
       new  3643b43   modtool: add basic support for GRC modules in block tree
       new  0f61e4e   Merge remote-tracking branch 
'skoslowski/modtool_block_modules'

The 8 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:
 gnuradio-runtime/lib/scheduler.h             | 2 +-
 gr-utils/python/modtool/grc_xml_generator.py | 2 +-
 gr-utils/python/modtool/templates.py         | 2 +-
 grc/gui/FlowGraph.py                         | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)