[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. 3.6.1git-171-g88fee47

[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  88fee472f56905fa2a469e516f35cf5d53edb2c5 (commit)
       via  0b8a592583845b4989be454083f415488319f367 (commit)
       via  ec30d89449f48fdd2f88420b4c87aba2e1a5abd1 (commit)
      from  420daf351fe6e93b63e2d9e8e7e7bd9c4cd1b8cf (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 88fee472f56905fa2a469e516f35cf5d53edb2c5
Merge: 420daf3 0b8a592
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 10 12:53:24 2012 -0400

    Merge branch 'master' into next

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

Summary of changes:
 docs/doxygen/other/volk_guide.dox                  |    2 +-
 gnuradio-core/src/lib/general/gr_add_ff.cc         |    2 +-
 gnuradio-core/src/lib/general/gr_char_to_float.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_char_to_short.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_complex_to_xxx.cc |   12 ++++++------
 gnuradio-core/src/lib/general/gr_conjugate_cc.cc   |    2 +-
 gnuradio-core/src/lib/general/gr_float_to_char.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_float_to_int.cc   |    2 +-
 gnuradio-core/src/lib/general/gr_float_to_short.cc |    2 +-
 gnuradio-core/src/lib/general/gr_int_to_float.cc   |    2 +-
 gnuradio-core/src/lib/general/gr_multiply_cc.cc    |    6 +++---
 .../src/lib/general/gr_multiply_conjugate_cc.cc    |    6 +++---
 .../src/lib/general/gr_multiply_const_cc.cc        |    6 +++---
 .../src/lib/general/gr_multiply_const_ff.cc        |    6 +++---
 gnuradio-core/src/lib/general/gr_multiply_ff.cc    |    2 +-
 gnuradio-core/src/lib/general/gr_short_to_char.cc  |    2 +-
 gnuradio-core/src/lib/general/gr_short_to_float.cc |    2 +-
 17 files changed, 30 insertions(+), 30 deletions(-)


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