[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.3-763-gce249f5

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, next has been updated
       via  ce249f5de750ff0cd5e167043070b4956eb8bfee (commit)
       via  0e5ccb49db08055cdb3f2de4beadc8de31ff31e5 (commit)
       via  b5bc1a3359e13a24e3329d92f32092e599e52d40 (commit)
       via  c6ef84436f6be534375d1b6ecfa08f565ff73cab (commit)
       via  d57af91afd6c432d9cc174a85dda7ee6869a766c (commit)
       via  a8455fd176a6e712604795b62f8934c9d911159a (commit)
       via  bfd77d906e90ae67d243e9a411b06b31781373b3 (commit)
       via  447613323a6c5bff0077f2afc26687326a59e484 (commit)
       via  29f51e3f95acb3918cf5ef9e9134254e256afbb4 (commit)
       via  405e89c48e9a20f45d74494ac08b026de27d3ee6 (commit)
      from  250e496d097ecc7034edf32211e79c545dfd4201 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce249f5de750ff0cd5e167043070b4956eb8bfee
Merge: d57af91 0e5ccb4
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 19 10:53:24 2013 -0500

    Merge branch 'master' into next
    
    Conflicts:
        docs/doxygen/Doxyfile.in

commit d57af91afd6c432d9cc174a85dda7ee6869a766c
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 19 10:48:37 2013 -0500

    core: prefs setup looks for a local .gnuradio/config.conf to use.
    
    Order of precedence:
    env. vars -> .gnuradio/config.conf -> ${prefix}/etc/gnuradio/conf.d/*

commit a8455fd176a6e712604795b62f8934c9d911159a
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 19 10:24:20 2013 -0500

    docs: adding an exclude rule for gr-modtool to avoid conflicts.

commit bfd77d906e90ae67d243e9a411b06b31781373b3
Author: Tom Rondeau <address@hidden>
Date:   Tue Feb 19 09:19:18 2013 -0500

    core: use prefs file to enable/disable ctrlport export of perf. counters.

commit 447613323a6c5bff0077f2afc26687326a59e484
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 18 19:59:56 2013 -0500

    ctrlport: using prefs files to configure ctrlport.
    
    Prefs file points to ctrlport config file and uses it to set the properties.

commit 29f51e3f95acb3918cf5ef9e9134254e256afbb4
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 18 17:55:14 2013 -0500

    ctrlport: adding a config param to enable/disable controlport, 
default=disabled.
    
    Also updates QA code for ctrlport to turn controlport on via env var.

commit 405e89c48e9a20f45d74494ac08b026de27d3ee6
Author: Tom Rondeau <address@hidden>
Date:   Mon Feb 18 17:54:26 2013 -0500

    core: prefs updated to handle cases of env var delared properly.

-----------------------------------------------------------------------

Summary of changes:
 docs/doxygen/Doxyfile.in                           |    3 +-
 docs/doxygen/other/ctrlport.dox                    |   29 ++++++++++++-
 gnuradio-core/CMakeLists.txt                       |   10 +---
 gnuradio-core/ctrlport.conf.example                |    5 ++
 gnuradio-core/ctrlport.conf.in                     |    6 ---
 gnuradio-core/gnuradio-core.conf                   |    4 ++
 gnuradio-core/src/lib/general/gr_prefs.cc          |   45 ++++++++++++++-----
 gnuradio-core/src/lib/general/gr_prefs.h           |    1 +
 gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc |   13 ++++--
 .../src/lib/runtime/gr_hier_block2_detail.cc       |   21 +++++++---
 gnuradio-core/src/lib/runtime/gr_top_block_impl.cc |    5 ++-
 .../src/lib/runtime/ice_application_base.h         |   38 ++++-------------
 .../python/gnuradio/ctrlport/qa_cpp_py_binding.py  |    2 +
 .../gnuradio/ctrlport/qa_cpp_py_binding_set.py     |    2 +
 14 files changed, 115 insertions(+), 69 deletions(-)
 create mode 100644 gnuradio-core/ctrlport.conf.example
 delete mode 100644 gnuradio-core/ctrlport.conf.in


hooks/post-receive
-- 
git://gnuradio.org/gnuradio