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

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 9e398c620af15bad25425888d9ec6e28a7edf74a
Merge: 2258236 c4eb231
Author: Johnathan Corgan <address@hidden>
Date:   Mon Mar 31 10:56:05 2014 -0700

    Merge branch 'maint'

 gnuradio-runtime/include/gnuradio/pycallback_object.h |  3 +++
 gr-blocks/lib/abs_XX_impl.cc.t                        | 10 ++++++----
 gr-filter/lib/CMakeLists.txt                          |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)