[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-759-ge2452ca

[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, next has been updated
       via  e2452caaf2e7f5fb640cda92b87f49f8f4d18c86 (commit)
       via  bf343e58bc5b4ef026bb4c8722312a6f123becf2 (commit)
       via  9ee8d2a6b98991686488db3c071cd98f84f45af4 (commit)
      from  b279da79d17ab8cd1bb011c5e6c0305c2a506462 (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 e2452caaf2e7f5fb640cda92b87f49f8f4d18c86
Merge: b279da7 bf343e5
Author: Tom Rondeau <address@hidden>
Date:   Tue Mar 5 16:08:08 2013 -0500

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/lib/general/gr_prefs.cc

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

Summary of changes:
 gnuradio-core/src/lib/general/gr_prefs.cc |   14 +++++++-------
 gnuradio-core/src/lib/general/gr_prefs.h  |   22 +++++++++++-----------
 gnuradio-core/src/lib/general/gr_prefs.i  |   22 +++++++++++-----------
 gr-blocks/lib/stream_pdu_base.cc          |    4 ++++
 gr-blocks/lib/tcp_connection.h            |    1 +
 gr-utils/python/modtool/modtool_newmod.py |    2 +-
 6 files changed, 35 insertions(+), 30 deletions(-)


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