[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.
From: |
git version control |
Subject: |
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-891-g9954d03 |
Date: |
Mon, 18 Mar 2013 17:19:08 +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 9954d0394f7ba5c301f3e6d3e4fccdc90ad1d3c8 (commit)
via 93192a843433d79e134719050d0a466aa47c4f4c (commit)
via 030990813829949bba04b1940312ac3b1ce79f3d (commit)
via 208d234d4434fdc0f2ae34b76d365eaee06a0b92 (commit)
via f9106c614cfc27558561c69ee4c070c1711fe0bd (commit)
via d2eab3b7bf96e2b910f30e80feaf93d78013063b (commit)
via bc79c5b78793caf198340ef2504ba07d0ddc3960 (commit)
via f936720f4a238c5571f16cd2ce1388eab6a6e5ac (commit)
via 921429d20affac9217ab7387d709b23e87d59075 (commit)
via 113c4ef92819e703d24eb6a409751f2757635528 (commit)
via c3d4fbf1809d6b3051a4c532d3d6bb5cadb3b6e3 (commit)
via 9aeaa4744a70605a0fb49ec1bc897e1b7dba19d9 (commit)
via 456790ef73c859c10bca0a1d18da7d00aaed47f0 (commit)
via 0a4a01a1068faa7239305d2bd67b341f407590e4 (commit)
via 3dc8a421e97707dcd3fde09fb615a6da7fe47de5 (commit)
via 055a847a850ff03af48bfc18a80a00ad34735d8c (commit)
from f15400470ce5cb68f5339ead7af726b8bbafd364 (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 9954d0394f7ba5c301f3e6d3e4fccdc90ad1d3c8
Author: Tim O'Shea <address@hidden>
Date: Mon Mar 18 10:14:25 2013 -0700
core: fix use of inaccesible methods in pycallback
commit 93192a843433d79e134719050d0a466aa47c4f4c
Merge: d2eab3b 0309908
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 18 10:09:06 2013 -0700
Merge branch 'master' into next
Conflicts:
config.h.in
commit d2eab3b7bf96e2b910f30e80feaf93d78013063b
Merge: 113c4ef f936720
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 18 09:44:46 2013 -0700
Merge branch 'master' into next
commit 113c4ef92819e703d24eb6a409751f2757635528
Merge: f154004 c3d4fbf
Author: Johnathan Corgan <address@hidden>
Date: Mon Mar 18 09:10:18 2013 -0700
Merge branch 'master' into next
Conflicts:
gr-digital/include/digital/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-digital/lib/scale_tags_impl.cc
gr-digital/lib/tagged_stream_check_impl.cc
gr-digital/lib/ts_insert_zeros_cc_impl.cc
gr-digital/python/qa_scale_tags.py
gr-digital/python/qa_ts_insert_zeros.py
gr-digital/swig/digital_swig.i
-----------------------------------------------------------------------
Summary of changes:
config.h.in | 11 ++-
docs/sphinx/gnuradio_sphinx.py | 27 ++++-
docs/sphinx/source/index.rst | 13 ++
docs/sphinx/source/uhd.rst | 9 ++
gnuradio-core/CMakeLists.txt | 2 +
gnuradio-core/src/lib/runtime/gr_logger.h | 2 +-
gnuradio-core/src/lib/runtime/pycallback_object.h | 17 +++-
gr-digital/examples/ofdm/ofdm_bugsquatch.py | 22 ----
gr-digital/grc/digital_scale_tags.xml | 31 -----
gr-digital/include/digital/CMakeLists.txt | 4 +-
gr-digital/include/digital/scale_tags.h | 58 ---------
gr-digital/include/digital/tagged_stream_check.h | 55 ---------
gr-digital/include/digital/ts_insert_zeros_cc.h | 55 ---------
gr-digital/lib/CMakeLists.txt | 4 +-
gr-digital/lib/scale_tags_impl.cc | 84 -------------
gr-digital/lib/scale_tags_impl.h | 51 --------
gr-digital/lib/tagged_stream_check_impl.cc | 112 ------------------
gr-digital/lib/tagged_stream_check_impl.h | 53 ---------
gr-digital/lib/ts_insert_zeros_cc_impl.cc | 130 ---------------------
gr-digital/lib/ts_insert_zeros_cc_impl.h | 54 ---------
gr-digital/python/CMakeLists.txt | 1 -
gr-digital/python/__init__.py | 1 -
gr-digital/python/fftshift.py | 31 -----
gr-digital/python/qa_ofdm_sync_sc_cfb.py | 2 -
gr-digital/python/qa_scale_tags.py | 57 ---------
gr-digital/python/qa_ts_insert_zeros.py | 78 ------------
gr-digital/swig/digital_swig.i | 14 +--
volk/apps/CMakeLists.txt | 4 +-
28 files changed, 82 insertions(+), 900 deletions(-)
create mode 100644 docs/sphinx/source/uhd.rst
delete mode 100644 gr-digital/examples/ofdm/ofdm_bugsquatch.py
delete mode 100644 gr-digital/grc/digital_scale_tags.xml
delete mode 100644 gr-digital/include/digital/scale_tags.h
delete mode 100644 gr-digital/include/digital/tagged_stream_check.h
delete mode 100644 gr-digital/include/digital/ts_insert_zeros_cc.h
delete mode 100644 gr-digital/lib/scale_tags_impl.cc
delete mode 100644 gr-digital/lib/scale_tags_impl.h
delete mode 100644 gr-digital/lib/tagged_stream_check_impl.cc
delete mode 100644 gr-digital/lib/tagged_stream_check_impl.h
delete mode 100644 gr-digital/lib/ts_insert_zeros_cc_impl.cc
delete mode 100644 gr-digital/lib/ts_insert_zeros_cc_impl.h
delete mode 100644 gr-digital/python/fftshift.py
delete mode 100755 gr-digital/python/qa_scale_tags.py
delete mode 100644 gr-digital/python/qa_ts_insert_zeros.py
hooks/post-receive
--
git://gnuradio.org/gnuradio
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-891-g9954d03,
git version control <=