[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.3-497-ge235f74

[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  e235f74d48fb8a6967901e6d9a8717381b2e4ce5 (commit)
       via  45657c97c05763f0b8d1531493ff3d1be923d21a (commit)
       via  5099198a501d7ef22a8cbfecfd410cf3619a36c5 (commit)
       via  e7b6bcc4639464a4661d20c055cc43948eaa7e97 (commit)
       via  241cacef600c0cc5eaaa560959958ad2784970cb (commit)
      from  9020cc86d3bd88ed5b9c957043567d98dbc0c1a5 (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 e235f74d48fb8a6967901e6d9a8717381b2e4ce5
Merge: 9020cc8 45657c9
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jan 14 16:00:54 2013 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt

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

Summary of changes:
 gnuradio-core/src/lib/io/gr_socket_pdu.h           |    1 +
 .../src/python/gnuradio/gr/CMakeLists.txt          |    8 --------
 gr-blocks/lib/file_source_impl.h                   |    1 +
 3 files changed, 2 insertions(+), 8 deletions(-)


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