[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 e9b72e0ebff1139c5bb9723645d6c06c8626baea
Merge: d2b7fc8 fab6c79
Author: Nathan West <address@hidden>
Date:   Mon Apr 11 12:36:39 2016 -0400

    Merge branch 'master' into next

 gr-digital/python/digital/qa_burst_shaper.py | 60 +++++++++++++++++++++-------
 gr-utils/python/modtool/modtool_rename.py    |  4 +-
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --cc gr-utils/python/modtool/modtool_rename.py
index aeb003b,4d3f5cb..86bafc5
--- a/gr-utils/python/modtool/modtool_rename.py
+++ b/gr-utils/python/modtool/modtool_rename.py
@@@ -28,11 -28,14 +28,11 @@@ from util_functions import append_re_li
  from cmakefile_editor import CMakeFileEditor
  from modtool_base import ModTool, ModToolException
  from templates import Templates
 -from code_generator import get_template
 -import Cheetah.Template
 -
  
  class ModToolRename(ModTool):
-     """ Add block to the out-of-tree module. """
+     """ Rename a block in the out-of-tree module. """
      name = 'rename'
-     aliases = ('insert',)
+     aliases = ('mv',)
  
      def __init__(self):
          ModTool.__init__(self)