[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'pinkavaj/argparse-01' 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 02b68053e40cfed3e99b896c20badd509b71d938
Merge: 53dc661 63bfba6
Author: Johnathan Corgan <address@hidden>
Date:   Wed May 11 10:32:09 2016 -0700

    Merge remote-tracking branch 'pinkavaj/argparse-01' into next

 gnuradio-runtime/examples/mp-sched/affinity_set.py |  8 ++---
 gnuradio-runtime/examples/mp-sched/plot_flops.py   | 15 ++++-----
 .../examples/mp-sched/run_synthetic.py             | 39 ++++++++++------------
 gr-utils/python/utils/grcc                         | 25 ++++++--------
 grc/blocks/options.xml                             |  4 +--
 grc/blocks/parameter.xml                           |  4 ++-
 grc/core/generator/flow_graph.tmpl                 | 12 +++----
 grc/main.py                                        | 12 +++----
 8 files changed, 55 insertions(+), 64 deletions(-)