[Commit-gnuradio] [gnuradio] 01/01: 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 91e8ecdcb55a224e1572dca5f920b4b2d347cb77
Merge: e89c1dc 0f61e4e
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 6 09:32:21 2016 -0700

    Merge branch 'master' into next
    
    Conflicts:
        gr-utils/python/modtool/templates.py

 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(-)

diff --cc gr-utils/python/modtool/templates.py
index 1d03d9f,2804224..07534e5
--- a/gr-utils/python/modtool/templates.py
+++ b/gr-utils/python/modtool/templates.py
@@@ -529,11 -519,11 +529,11 @@@ if __name__ == '__main__'
  
  Templates['grc_xml'] = '''<?xml version="1.0"?>
  <block>
 -  <name>$blockname</name>
 -  <key>${modname}_$blockname</key>
 -  <category>[$modname]</category>
 -  <import>import $modname</import>
 -  <make>${modname}.${blockname}(${strip_arg_types_grc($arglist)})</make>
 +  <name>${blockname}</name>
 +  <key>${modname}_${blockname}</key>
-   <category>${modname}</category>
++  <category>[${modname}]</category>
 +  <import>import ${modname}</import>
 +  <make>${modname}.${blockname}(${strip_arg_types_grc(arglist)})</make>
    <!-- Make one 'param' node for every Parameter you want settable from the 
GUI.
         Sub-nodes:
         * name