Merge branch 'maint' of https://github.com/guruofquality/gnuradio into v3.6.4git_gras_support

Conflicts:
	gnuradio-core/src/lib/runtime/gr_block.cc
	gnuradio-core/src/lib/runtime/gr_block.h
	gnuradio-core/src/lib/runtime/gr_types.h

1 files changed, 35 insertions, 0 deletions

diff --git a/gr-utils/src/python/modtool/__init__.py b/gr-utils/src/python/modtool/__init__.py
new file mode 100644
index 000000000..a242722ab
--- /dev/null
+++ b/gr-utils/src/python/modtool/__init__.py
@@ -0,0 +1,35 @@
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from cmakefile_editor import CMakeFileEditor
+from code_generator import GRMTemplate
+from grc_xml_generator import GRCXMLGenerator
+from modtool_base import ModTool, get_class_dict
+from modtool_add import ModToolAdd
+from modtool_disable import ModToolDisable
+from modtool_info import ModToolInfo
+from modtool_makexml import ModToolMakeXML
+from modtool_newmod import ModToolNewModule
+from modtool_rm import ModToolRemove
+# Leave this at the end
+from modtool_help import ModToolHelp
+from parser_cc_block import ParserCCBlock
+from util_functions import *