commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.2git-400-g5892c29
Date: Tue, 28 Aug 2012 19:51:37 +0000 (UTC)

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  5892c29ee0509ff8aa226f14da524f7ec30f9654 (commit)
       via  fc4d37062c46886d3bc1fb0b6c3626d779be4ecd (commit)
       via  3e46aef392ba9b2e63bbfefefdb7178cc87049ab (commit)
       via  fe96ee8d82b2666951cf3cef8f7f5d991396273f (commit)
       via  41041c3d2d1468c4d37f9ed36a3b172b3d60da9c (commit)
       via  370afff335cf9903408dcf6dd72638fc632faea3 (commit)
       via  87418936858f6e674c006b84ecfc0a6fd9feacfe (commit)
       via  fbb1abb0e7606fb81783e3c5bd511856355f6b27 (commit)
       via  9be7c30d6df3fb8bd75db0659fa7a7d163d65657 (commit)
       via  1f57cf3fee8ded4d58e77bef8ffd8d8ce4aca53c (commit)
       via  c27d9d3bac3a870fee9ec8c4289ae65ab4f2decc (commit)
       via  5581c1913b9a77fcde11b4e25a07a06d076487a4 (commit)
       via  fd3abfe06ef4f574122d2d2a08b716db8c2b776d (commit)
       via  a3638941859c8ac2f61dfc81ff1837997d5540eb (commit)
      from  7adff515181de5cfbd7392d934cac9083a8a6a58 (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 5892c29ee0509ff8aa226f14da524f7ec30f9654
Merge: 7adff51 fc4d370
Author: Johnathan Corgan <address@hidden>
Date:   Tue Aug 28 12:52:09 2012 -0700

    Merge remote branch 'reynwar/comments_next' into next
    
    Conflicts:
        gr-digital/include/digital_constellation.h
        gr-digital/python/bpsk.py
        gr-digital/python/qpsk.py

commit fc4d37062c46886d3bc1fb0b6c3626d779be4ecd
Author: Ben Reynwar <address@hidden>
Date:   Tue Aug 14 10:28:23 2012 -0700

    docs: Modified argument formating in python docstrings in grc.

commit 3e46aef392ba9b2e63bbfefefdb7178cc87049ab
Author: Ben Reynwar <address@hidden>
Date:   Tue Aug 14 07:12:53 2012 -0700

    docs: Changed arguments in python docstrings to new formatting style.

commit fe96ee8d82b2666951cf3cef8f7f5d991396273f
Author: Ben Reynwar <address@hidden>
Date:   Mon Aug 13 13:46:28 2012 -0700

    docs: Formatted python docstrings for sphinx docs.

commit 41041c3d2d1468c4d37f9ed36a3b172b3d60da9c
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 12:07:43 2012 -0700

    docs: Updating sphinx docs for changes to new block style.

commit 370afff335cf9903408dcf6dd72638fc632faea3
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 11:52:12 2012 -0700

    docs: Updating sphinx docs for movement of blocks from gr to digital.

commit 87418936858f6e674c006b84ecfc0a6fd9feacfe
Merge: fbb1abb 9be7c30
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 11:20:30 2012 -0700

    Merged comments branch into comments_next branch.

commit fbb1abb0e7606fb81783e3c5bd511856355f6b27
Merge: 1f57cf3 9d8c03e
Author: Ben Reynwar <address@hidden>
Date:   Fri Aug 10 11:11:45 2012 -0700

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

commit 9be7c30d6df3fb8bd75db0659fa7a7d163d65657
Merge: c27d9d3 9305abf
Author: Ben Reynwar <address@hidden>
Date:   Wed Aug 8 14:26:07 2012 -0700

    Merge branch 'master' into comments

commit 1f57cf3fee8ded4d58e77bef8ffd8d8ce4aca53c
Merge: fd3abfe 8810102
Author: Ben Reynwar <address@hidden>
Date:   Mon Jun 25 08:09:05 2012 -0700

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

commit c27d9d3bac3a870fee9ec8c4289ae65ab4f2decc
Merge: a363894 5581c19
Author: Ben Reynwar <address@hidden>
Date:   Tue May 22 10:23:36 2012 -0700

    Merge branch 'sphinxdocs' into comments

commit 5581c1913b9a77fcde11b4e25a07a06d076487a4
Author: Ben Reynwar <address@hidden>
Date:   Tue May 22 10:22:45 2012 -0700

    wavelet: Move squash_ff comments so that doxyxml captures them.

commit fd3abfe06ef4f574122d2d2a08b716db8c2b776d
Merge: b4558db f684f3c
Author: Ben Reynwar <address@hidden>
Date:   Mon May 21 13:22:41 2012 -0700

    Merge branch 'sphinxdocs' into next

commit a3638941859c8ac2f61dfc81ff1837997d5540eb
Author: Ben Reynwar <address@hidden>
Date:   Mon May 21 11:40:15 2012 -0700

    docs: Adding/editing top-level docstrings.

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

Summary of changes:
 docs/sphinx/source/digital/blocks.rst              |   19 ++
 docs/sphinx/source/digital/index.rst               |   23 ++-
 docs/sphinx/source/gr/coding_blk.rst               |    6 -
 docs/sphinx/source/gr/converter_blk.rst            |    7 -
 docs/sphinx/source/gr/index.rst                    |   19 --
 docs/sphinx/source/gr/sink_blk.rst                 |    2 -
 docs/sphinx/source/gr/source_blk.rst               |    2 -
 docs/sphinx/source/gr/sync_blk.rst                 |    2 -
 docs/sphinx/source/qtgui/index.rst                 |    8 +-
 docs/sphinx/source/wavelet.rst                     |    6 +-
 gnuradio-core/src/python/gnuradio/__init__.py      |   13 +-
 .../src/python/gnuradio/blks2/__init__.py          |    3 +
 .../src/python/gnuradio/blks2impl/am_demod.py      |   20 +-
 .../src/python/gnuradio/blks2impl/filterbank.py    |   10 +-
 .../src/python/gnuradio/blks2impl/fm_demod.py      |   36 +--
 .../src/python/gnuradio/blks2impl/fm_emph.py       |   16 +-
 .../src/python/gnuradio/blks2impl/nbfm_rx.py       |   13 +-
 .../src/python/gnuradio/blks2impl/nbfm_tx.py       |   13 +-
 .../gnuradio/blks2impl/rational_resampler.py       |   26 +-
 .../blks2impl/stream_to_vector_decimator.py        |   22 +-
 .../src/python/gnuradio/blks2impl/wfm_rcv.py       |    7 +-
 .../src/python/gnuradio/blks2impl/wfm_rcv_fmdet.py |    7 +-
 .../src/python/gnuradio/blks2impl/wfm_rcv_pll.py   |    7 +-
 .../src/python/gnuradio/blks2impl/wfm_tx.py        |   13 +-
 gnuradio-core/src/python/gnuradio/eng_notation.py  |    3 +
 gnuradio-core/src/python/gnuradio/eng_option.py    |    3 +-
 gnuradio-core/src/python/gnuradio/gr/__init__.py   |    4 +
 .../src/python/gnuradio/gr/hier_block2.py          |    4 +-
 gnuradio-core/src/python/gnuradio/gr/top_block.py  |    6 +
 gnuradio-core/src/python/gnuradio/gr_unittest.py   |    3 +
 .../src/python/gnuradio/gruimpl/socket_stuff.py    |   18 +-
 gnuradio-core/src/python/gnuradio/optfir.py        |  118 +++++----
 gr-atsc/src/python/atsc_utils.py                   |    3 +-
 gr-atsc/src/python/qa_atsc.py                      |    4 +-
 gr-audio/swig/__init__.py                          |    9 +-
 gr-digital/examples/narrowband/receive_path.py     |    4 +-
 gr-digital/examples/narrowband/transmit_path.py    |    4 +-
 gr-digital/examples/narrowband/tunnel.py           |    5 +-
 gr-digital/examples/ofdm/receive_path.py           |    4 +-
 gr-digital/examples/ofdm/transmit_path.py          |    4 +-
 gr-digital/examples/ofdm/tunnel.py                 |    5 +-
 gr-digital/python/__init__.py                      |    3 +-
 gr-digital/python/bpsk.py                          |  102 ++++----
 gr-digital/python/cpm.py                           |   61 ++---
 gr-digital/python/generic_mod_demod.py             |   95 +++----
 gr-digital/python/gfsk.py                          |   37 +--
 gr-digital/python/gmsk.py                          |   72 ++---
 gr-digital/python/modulation_utils.py              |    9 +-
 gr-digital/python/ofdm.py                          |   18 +-
 gr-digital/python/ofdm_packet_utils.py             |   34 +--
 gr-digital/python/ofdm_receiver.py                 |   19 +-
 gr-digital/python/packet_utils.py                  |   28 +-
 gr-digital/python/pkt.py                           |   31 +--
 gr-digital/python/psk.py                           |   47 ++--
 gr-digital/python/qam.py                           |   45 ++--
 gr-digital/python/qpsk.py                          |   90 ++++---
 gr-digital/python/utils/mod_codes.py               |    1 +
 gr-fft/python/logpwrfft.py                         |   36 ++-
 gr-filter/python/optfir.py                         |  117 +++++----
 gr-filter/python/rational_resampler.py             |   26 +-
 gr-qtgui/swig/__init__.py                          |    4 +
 gr-trellis/src/lib/trellis.i                       |    1 +
 gr-uhd/apps/hf_radio/input.py                      |    4 +-
 gr-uhd/apps/uhd_siggen_base.py                     |    4 +-
 gr-uhd/examples/python/fm_tx4.py                   |    3 +-
 gr-uhd/examples/python/fm_tx_2_daughterboards.py   |    5 +-
 gr-uhd/examples/python/usrp_am_mw_rcv.py           |    3 +-
 gr-uhd/examples/python/usrp_nbfm_ptt.py            |    6 +-
 gr-uhd/examples/python/usrp_nbfm_rcv.py            |    3 +-
 gr-uhd/examples/python/usrp_spectrum_sense.py      |    3 +-
 gr-uhd/examples/python/usrp_tv_rcv.py              |    3 +-
 gr-uhd/examples/python/usrp_wfm_rcv.py             |    3 +-
 gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py       |    3 +-
 gr-uhd/examples/python/usrp_wfm_rcv_nogui.py       |    3 +-
 gr-uhd/examples/python/usrp_wfm_rcv_pll.py         |    3 +-
 gr-uhd/examples/python/usrp_wfm_rcv_sca.py         |    3 +-
 gr-uhd/examples/python/usrp_wxapt_rcv.py           |    3 +-
 gr-utils/src/python/plot_data.py                   |    3 +
 gr-wavelet/python/__init__.py                      |    3 +-
 gr-wxgui/grc/panel.py                              |   16 +-
 gr-wxgui/grc/top_block_gui.py                      |    8 +-
 gr-wxgui/src/python/__init__.py                    |    3 +-
 gr-wxgui/src/python/common.py                      |   68 ++++--
 gr-wxgui/src/python/const_window.py                |    8 +-
 gr-wxgui/src/python/fft_window.py                  |    8 +-
 gr-wxgui/src/python/forms/__init__.py              |   37 ++--
 gr-wxgui/src/python/forms/forms.py                 |  296 +++++++++++---------
 gr-wxgui/src/python/histo_window.py                |    8 +-
 gr-wxgui/src/python/number_window.py               |   12 +-
 gr-wxgui/src/python/plotter/bar_plotter.py         |   18 +-
 gr-wxgui/src/python/plotter/channel_plotter.py     |   34 ++-
 gr-wxgui/src/python/plotter/common.py              |   34 ++-
 gr-wxgui/src/python/plotter/grid_plotter_base.py   |  106 +++++---
 gr-wxgui/src/python/plotter/plotter_base.py        |   12 +-
 gr-wxgui/src/python/plotter/waterfall_plotter.py   |   38 ++-
 gr-wxgui/src/python/scope_window.py                |    8 +-
 gr-wxgui/src/python/slider.py                      |    9 +-
 gr-wxgui/src/python/waterfall_window.py            |    8 +-
 grc/base/Block.py                                  |   50 +++-
 grc/base/Connection.py                             |   20 +-
 grc/base/Element.py                                |   12 +-
 grc/base/FlowGraph.py                              |   66 ++++--
 grc/base/Param.py                                  |   14 +-
 grc/base/ParseXML.py                               |   36 ++-
 grc/base/Platform.py                               |   38 ++-
 grc/base/Port.py                                   |   16 +-
 grc/base/odict.py                                  |   32 ++-
 grc/grc_gnuradio/blks2/error_rate.py               |    8 +-
 grc/grc_gnuradio/blks2/packet.py                   |   24 +-
 grc/grc_gnuradio/blks2/selector.py                 |   34 ++-
 grc/grc_gnuradio/blks2/tcp.py                      |   12 +-
 grc/gui/ActionHandler.py                           |   18 +-
 grc/gui/Actions.py                                 |   14 +-
 grc/gui/Block.py                                   |   32 ++-
 grc/gui/BlockTreeWindow.py                         |   16 +-
 grc/gui/Connection.py                              |   14 +-
 grc/gui/Dialogs.py                                 |   20 +-
 grc/gui/DrawingArea.py                             |    4 +-
 grc/gui/Element.py                                 |   84 ++++--
 grc/gui/FileDialogs.py                             |   22 +-
 grc/gui/FlowGraph.py                               |   84 ++++--
 grc/gui/MainWindow.py                              |   62 +++--
 grc/gui/Messages.py                                |    8 +-
 grc/gui/NotebookPage.py                            |   58 +++-
 grc/gui/Param.py                                   |    8 +-
 grc/gui/Port.py                                    |   42 ++-
 grc/gui/PropsDialog.py                             |   24 ++-
 grc/gui/StateCache.py                              |   20 +-
 grc/gui/Utils.py                                   |   38 ++-
 grc/python/Block.py                                |   26 ++-
 grc/python/FlowGraph.py                            |   48 +++-
 grc/python/Generator.py                            |   14 +-
 grc/python/Param.py                                |   28 ++-
 grc/python/Port.py                                 |   20 +-
 grc/python/expr_utils.py                           |   56 +++-
 grc/python/extract_docs.py                         |   16 +-
 136 files changed, 2027 insertions(+), 1277 deletions(-)


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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]