[Commit-gnuradio] [gnuradio] 12/14: Merge remote-tracking branch 'osh/cpx_to_ishort_vector'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5f19a86603ecf08247dd57597134f125c08b8ef8
Merge: 2c650bd eb4602a
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 9 14:09:32 2014 -0700

    Merge remote-tracking branch 'osh/cpx_to_ishort_vector'

 gr-blocks/grc/blocks_complex_to_interleaved_short.xml | 19 ++++++++++++++++++-
 .../gnuradio/blocks/complex_to_interleaved_short.h    |  2 +-
 gr-blocks/lib/complex_to_interleaved_short_impl.cc    | 18 ++++++++++--------
 gr-blocks/lib/complex_to_interleaved_short_impl.h     |  4 +++-
 4 files changed, 32 insertions(+), 11 deletions(-)