[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 403933efe1c59ee1cba0da35c9280083108fc3b4
Merge: eceee28 e6a396f
Author: Tom Rondeau <address@hidden>
Date:   Mon Jul 7 10:53:57 2014 -0400

    Merge branch 'maint'

 gr-blocks/include/gnuradio/blocks/char_to_short.h          | 7 ++++---
 gr-blocks/include/gnuradio/blocks/delay.h                  | 3 +++
 gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h   | 3 ++-
 gr-blocks/include/gnuradio/blocks/file_descriptor_source.h | 3 ++-
 gr-blocks/include/gnuradio/blocks/short_to_char.h          | 4 ++++
 gr-filter/lib/firdes.cc                                    | 2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)