[Commit-gnuradio] [gnuradio] 13/13: Merge remote-tracking branch 'tkuester/documentation'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 24b9e5bee104769db1bef04feda0c6fd07a3bc29
Merge: 4313320 850d5ca
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 15 16:50:38 2014 -0700

    Merge remote-tracking branch 'tkuester/documentation'

 gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h   |  9 +++++++++
 gr-blocks/include/gnuradio/blocks/short_to_char.h    |  6 ++++++
 gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h |  8 ++++++++
 gr-digital/python/digital/psk.py                     | 18 +++++++++++++-----
 4 files changed, 36 insertions(+), 5 deletions(-)