[Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. 3.6.2git-4-g4a1c2f6

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

The branch, master has been updated
       via  4a1c2f6d82580f9de5a4d781c547d88ec89006be (commit)
       via  07d2fbf97ba715b339c182185147567e329fc8c8 (commit)
       via  8fac158d68c80ba6c5fcb9256cad1e8d6b7a77c1 (commit)
       via  403103de15cc60e73d38b56cbc16004123eeeda1 (commit)
      from  a4632157c6aa4d18e29ff917d44509a9de9ea71c (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 4a1c2f6d82580f9de5a4d781c547d88ec89006be
Merge: a463215 07d2fbf
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 13 11:06:49 2012 -0400

    Merge branch 'master-mods'

commit 07d2fbf97ba715b339c182185147567e329fc8c8
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 13 11:05:42 2012 -0400

    core: modifications to gr_annotator_raw.
    
    Using mutex to make add_tag and work thread safe.
    
    Throwing exception intead of asserting on error.

commit 8fac158d68c80ba6c5fcb9256cad1e8d6b7a77c1
Merge: 3e4f9b9 403103d
Author: Tom Rondeau <address@hidden>
Date:   Wed Jun 13 09:53:42 2012 -0400

    Merge branch 'master-mods' of git://github.com/osh/gnuradio-1 into 
master-mods

commit 403103de15cc60e73d38b56cbc16004123eeeda1
Author: Tim O'Shea <address@hidden>
Date:   Tue Jun 12 17:36:34 2012 -0400

    new block, gr_annotator_raw
     allows passing a raw pmt k->v pair from outside the flowgraph/python
     in at exact samples
    
    also added GRUEL autogenerated .i files to gnuradio-core-swig include line

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

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