[Top][All Lists]
[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-61-gaca5d3a |
Date: |
Wed, 13 Jun 2012 15:06:06 +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 aca5d3a12e8cbcb7067bb9acd21e473543730741 (commit)
via 4a1c2f6d82580f9de5a4d781c547d88ec89006be (commit)
via 07d2fbf97ba715b339c182185147567e329fc8c8 (commit)
via 8fac158d68c80ba6c5fcb9256cad1e8d6b7a77c1 (commit)
via 403103de15cc60e73d38b56cbc16004123eeeda1 (commit)
from 03ece8eff366ff5e760df0883ab9b70c92e34d0d (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 aca5d3a12e8cbcb7067bb9acd21e473543730741
Merge: 03ece8e 4a1c2f6
Author: Tom Rondeau <address@hidden>
Date: Wed Jun 13 11:07:00 2012 -0400
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
gnuradio-core/CMakeLists.txt | 1 +
gnuradio-core/src/lib/general/CMakeLists.txt | 1 +
gnuradio-core/src/lib/general/general.i | 2 +
gnuradio-core/src/lib/general/gr_annotator_raw.cc | 106 ++++++++++++++++++++
.../{gr_burst_tagger.h => gr_annotator_raw.h} | 55 ++++++-----
...{gr_annotator_alltoall.i => gr_annotator_raw.i} | 13 ++-
6 files changed, 147 insertions(+), 31 deletions(-)
create mode 100644 gnuradio-core/src/lib/general/gr_annotator_raw.cc
copy gnuradio-core/src/lib/general/{gr_burst_tagger.h => gr_annotator_raw.h}
(50%)
copy gnuradio-core/src/lib/general/{gr_annotator_alltoall.i =>
gr_annotator_raw.i} (88%)
hooks/post-receive
--
git://gnuradio.org/gnuradio
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.2git-61-gaca5d3a,
git version control <=