[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.3-773-g68fbb9e |
Date: |
Wed, 20 Feb 2013 19:11:14 +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 68fbb9eb29d23dd1a177a1205152635d564f992a (commit)
via f104d4b100c9b7aa4e3011777989ad6b8951ddef (commit)
via 45c9daa0a7b7dc2316607aa3762e268ce1793dce (commit)
via 83b45543ee5a5533b3a384a3eed2e5ca0047a70c (commit)
via 7cbeddfd5a0cffba51a3946a8dd44b9838e42361 (commit)
via 2e2ed85be902b5ddae91bf22d9051554b1bdfd0b (commit)
via 627958e8b21edabff55f3beb87c01cea5fd1dd77 (commit)
from f4762c567bf5ec85b998935ee330d7c0e986dc57 (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 68fbb9eb29d23dd1a177a1205152635d564f992a
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 20 14:11:24 2013 -0500
qtgui: fixed bounds checking and a typo.
commit f104d4b100c9b7aa4e3011777989ad6b8951ddef
Merge: 83b4554 45c9daa
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 20 13:34:34 2013 -0500
Merge branch 'master' into next
Conflicts:
gr-digital/grc/digital_block_tree.xml
commit 83b45543ee5a5533b3a384a3eed2e5ca0047a70c
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 20 12:21:29 2013 -0500
digital: cleaning up conversion to 3.7 for simple_correlator.
blocks: same for count_bits.
commit 7cbeddfd5a0cffba51a3946a8dd44b9838e42361
Merge: f4762c5 2e2ed85
Author: Tom Rondeau <address@hidden>
Date: Wed Feb 20 12:20:29 2013 -0500
Merge branch 'master' into next
Conflicts:
gr-digital/include/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-digital/swig/CMakeLists.txt
gr-digital/swig/digital_swig.i
-----------------------------------------------------------------------
Summary of changes:
docs/sphinx/source/gr/index.rst | 7 -
docs/sphinx/source/gr/sync_blk.rst | 4 -
gnuradio-core/src/lib/general/CMakeLists.txt | 3 -
gnuradio-core/src/lib/general/general.i | 2 -
gnuradio-core/src/lib/general/gr_count_bits.cc | 93 --------
gnuradio-core/src/lib/general/gr_count_bits.h | 33 ---
.../src/lib/general/gr_simple_correlator.cc | 237 --------------------
.../src/lib/general/gr_simple_correlator.h | 111 ---------
.../src/lib/general/gr_simple_correlator.i | 31 ---
gr-blocks/include/blocks/CMakeLists.txt | 1 +
.../blocks/{multiply_XX.h.t => count_bits.h} | 33 +--
gr-blocks/lib/CMakeLists.txt | 1 +
gr-blocks/lib/count_bits.cc | 78 +++++++
gr-digital/grc/digital_block_tree.xml | 1 +
.../grc/digital_simple_correlator.xml | 6 +-
gr-digital/include/digital/CMakeLists.txt | 1 +
.../digital/simple_correlator.h} | 28 ++-
gr-digital/lib/CMakeLists.txt | 1 +
gr-digital/lib/correlate_access_code_bb_impl.cc | 4 +-
.../lib/correlate_access_code_tag_bb_impl.cc | 4 +-
gr-digital/lib/packet_sink_impl.cc | 4 +-
gr-digital/lib/simple_correlator_impl.cc | 237 ++++++++++++++++++++
gr-digital/lib/simple_correlator_impl.h | 102 +++++++++
...qa_simple_framer.py => qa_simple_correlator.py} | 44 ++--
gr-digital/swig/digital_swig.i | 3 +
gr-pager/lib/CMakeLists.txt | 2 +
gr-pager/lib/flex_sync_impl.cc | 6 +-
gr-qtgui/apps/gr_time_plot_b | 2 +-
gr-qtgui/apps/plot_form.py | 16 +-
grc/blocks/block_tree.xml | 2 -
30 files changed, 504 insertions(+), 593 deletions(-)
delete mode 100644 docs/sphinx/source/gr/sync_blk.rst
delete mode 100644 gnuradio-core/src/lib/general/gr_count_bits.cc
delete mode 100644 gnuradio-core/src/lib/general/gr_count_bits.h
delete mode 100644 gnuradio-core/src/lib/general/gr_simple_correlator.cc
delete mode 100644 gnuradio-core/src/lib/general/gr_simple_correlator.h
delete mode 100644 gnuradio-core/src/lib/general/gr_simple_correlator.i
copy gr-blocks/include/blocks/{multiply_XX.h.t => count_bits.h} (59%)
create mode 100644 gr-blocks/lib/count_bits.cc
rename grc/blocks/gr_simple_correlator.xml =>
gr-digital/grc/digital_simple_correlator.xml (74%)
copy gr-digital/{lib/diff_phasor_cc_impl.h =>
include/digital/simple_correlator.h} (62%)
create mode 100644 gr-digital/lib/simple_correlator_impl.cc
create mode 100644 gr-digital/lib/simple_correlator_impl.h
copy gr-digital/python/{qa_simple_framer.py => qa_simple_correlator.py} (51%)
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.3-773-g68fbb9e,
git version control <=