[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 41ce01bd6f602009b83422550b0b91bddd830c84

[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/jblum".

The branch, next has been updated
       via  41ce01bd6f602009b83422550b0b91bddd830c84 (commit)
       via  a4dbd973fc6376bacf3c45e63aba61a471c468b3 (commit)
       via  2d5a6f86fd3047748a9f816548e2901b02838734 (commit)
       via  45c2212608ca66b5fadbc860771e042198e1ebcd (commit)
       via  0319e05a4bb9a41082d00e334ac1647314dfaacd (commit)
       via  df09ce46e6783352e09981f61f1f25f1db1ab68c (commit)
       via  bade47de8c8e9fe92ae7a777260e900d6c708f09 (commit)
       via  4496fae2deea200755225c007a26f4c7be0470e9 (commit)
       via  4ba2c75f9109b750f8c04b60a04f2100e33e9416 (commit)
       via  33158da478cb0db5739663556e8dbeccbf08d7c9 (commit)
       via  25fd6e0324dc8296b66a3c9b8e628d6738f15fe7 (commit)
       via  32ef4974395913878f252434c21a63a259bb9b97 (commit)
       via  0d72c2c86f762279f944c576904d5c6af4895a7b (commit)
       via  9e22f254561137e9236460ce00bea525aa4d65f9 (commit)
       via  9ef30ab61c213a8e45d35768425f5759d27c14a8 (commit)
       via  bc98dc91bbad8d70bd0b45eb5077cc37da605b98 (commit)
      from  5179a1ead31e678d575890fb2e413c62bf00c255 (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 41ce01bd6f602009b83422550b0b91bddd830c84
Merge: 5179a1e a4dbd97
Author: Josh Blum <address@hidden>
Date:   Mon Oct 17 07:35:56 2011 -0700

    Merge branch 'next' of http://gnuradio.org/git/gnuradio into next

commit a4dbd973fc6376bacf3c45e63aba61a471c468b3
Merge: e0fdd93 2d5a6f8
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 22:14:29 2011 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-qtgui/lib/Makefile.am

commit 2d5a6f86fd3047748a9f816548e2901b02838734
Merge: bbee6d5 45c2212
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 21:34:24 2011 -0400

    Merge branch 'maint'

commit 45c2212608ca66b5fadbc860771e042198e1ebcd
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 19:45:29 2011 -0400

    qtgui: more compatability issues.

commit 0319e05a4bb9a41082d00e334ac1647314dfaacd
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 18:39:45 2011 -0400

    qtgui: wip: working to make plots backwards compatible with qwt 5.2.

commit df09ce46e6783352e09981f61f1f25f1db1ab68c
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 17:56:51 2011 -0400

    qtgui: adjusting intensity knobs and auto scale in waterfall works in qwt6.

commit bade47de8c8e9fe92ae7a777260e900d6c708f09
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 17:35:24 2011 -0400

    qtgui: fixed waterfall color map issue under qwt6.

commit 4496fae2deea200755225c007a26f4c7be0470e9
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 16:32:41 2011 -0400

    qtgui: waterfall plot mostly working under qwt6 (plots, but updates to 
scale and color not working yet).

commit 4ba2c75f9109b750f8c04b60a04f2100e33e9416
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 00:23:32 2011 -0400

    qtgui: constellation plot working again under qwt6.

commit 33158da478cb0db5739663556e8dbeccbf08d7c9
Author: Tom Rondeau <address@hidden>
Date:   Sun Oct 16 00:19:10 2011 -0400

    qtgui: Time domain plot working againt under qwt6.

commit 25fd6e0324dc8296b66a3c9b8e628d6738f15fe7
Author: Tom Rondeau <address@hidden>
Date:   Sat Oct 15 18:23:04 2011 -0400

    qtgui: wip: updating qtgui to work with QWT 6 (and trying to maintain 
backwards compatability to 5.2). This wip works for just the fft plots.

commit 32ef4974395913878f252434c21a63a259bb9b97
Author: Tom Rondeau <address@hidden>
Date:   Sat Oct 15 16:32:35 2011 -0400

    qtgui: avoids a simple warning.

commit 0d72c2c86f762279f944c576904d5c6af4895a7b
Author: Tom Rondeau <address@hidden>
Date:   Sat Oct 15 13:45:00 2011 -0400

    build: needed boost_filesystem lib added (found under ubuntu 11.10; they're 
getting pickier).

commit 9e22f254561137e9236460ce00bea525aa4d65f9
Author: Tom Rondeau <address@hidden>
Date:   Sat Oct 15 13:44:22 2011 -0400

    config: fixing up for new rules in automake.

commit 9ef30ab61c213a8e45d35768425f5759d27c14a8
Author: Tom Rondeau <address@hidden>
Date:   Sat Oct 15 11:20:33 2011 -0400

    build: fixed a bug with missing boost filesystem lib.

commit bc98dc91bbad8d70bd0b45eb5077cc37da605b98
Author: Tom Rondeau <address@hidden>
Date:   Sat Oct 15 10:38:46 2011 -0400

    config: fixed qwt checks to be available over more versions.

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

Summary of changes:
 config/ax_boost_base.m4                  |    8 +-
 config/ax_boost_python.m4                |    8 +-
 config/ax_boost_thread.m4                |   12 +-
 config/gr_check_createfilemapping.m4     |   11 +-
 config/gr_lib64.m4                       |    2 +-
 config/gr_qwt.m4                         |    4 +-
 configure.ac                             |    3 +-
 gnuradio-core/src/lib/Makefile.am        |    4 +-
 gr-audio/examples/c++/Makefile.am        |    4 +-
 gr-qtgui/include/qtgui_sink_f.h          |    1 -
 gr-qtgui/include/qtgui_util.h            |    9 ++-
 gr-qtgui/lib/ConstellationDisplayPlot.cc |   39 ++++++-
 gr-qtgui/lib/ConstellationDisplayPlot.h  |    9 ++
 gr-qtgui/lib/FrequencyDisplayPlot.cc     |   69 +++++++++++-
 gr-qtgui/lib/FrequencyDisplayPlot.h      |    9 ++
 gr-qtgui/lib/Makefile.am                 |    2 +-
 gr-qtgui/lib/TimeDomainDisplayPlot.cc    |   42 +++++++-
 gr-qtgui/lib/TimeDomainDisplayPlot.h     |    8 ++
 gr-qtgui/lib/WaterfallDisplayPlot.cc     |  183 ++++++++++++++++++++++++------
 gr-qtgui/lib/WaterfallDisplayPlot.h      |   25 ++++-
 gr-qtgui/lib/plot_waterfall.cc           |  132 +++++++++------------
 gr-qtgui/lib/plot_waterfall.h            |   32 ++++--
 gr-qtgui/lib/qtgui_util.cc               |   34 ++++++-
 gr-qtgui/lib/spectrumdisplayform.cc      |   22 ++--
 gr-qtgui/lib/waterfallGlobalData.cc      |   76 ++++++++++++-
 gr-qtgui/lib/waterfallGlobalData.h       |   12 ++
 gr-usrp/apps/Makefile.am                 |    3 +-
 27 files changed, 582 insertions(+), 181 deletions(-)


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