[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 6eb9061b9fd25566690fd9a862cf243cb31820b0
Merge: 22b01e3 ad799cf
Author: Johnathan Corgan <address@hidden>
Date:   Tue May 27 15:14:19 2014 -0700

    Merge branch 'master' into next

 gr-vocoder/lib/codec2/c2dec.c               | 136 +++++++++++++++++++---------
 gr-vocoder/lib/codec2/c2demo.c              |   3 +-
 gr-vocoder/lib/codec2/c2enc.c               |  15 ++-
 gr-vocoder/lib/codec2/c2sim.c               |   8 +-
 gr-vocoder/lib/codec2/codec2.c              |  48 +++++++---
 gr-vocoder/lib/codec2/codec2.h              |   4 +-
 gr-vocoder/lib/codec2/codec2_internal.h     |   1 +
 gr-vocoder/lib/codec2/dump.c                |  20 ++++
 gr-vocoder/lib/codec2/dump.h                |   1 +
 gr-vocoder/lib/codec2/nlp.c                 |   2 +-
 gr-vocoder/lib/codec2/pack.c                |  49 ++++++++--
 gr-vocoder/lib/codec2/quantise.h            |   2 +
 gr-vocoder/lib/codec2_decode_ps_impl.cc     |   2 +-
 gr-zeromq/python/zeromq/qa_zeromq_pubsub.py |  52 +++++++++++
 14 files changed, 270 insertions(+), 73 deletions(-)