[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'pinkavaj/vect_integrate-00'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 8ecfd13af0f55818d178fde17182de12b60ba4f1
Merge: b8b7171 f426108
Author: Johnathan Corgan <address@hidden>
Date:   Mon Feb 23 04:16:37 2015 -0800

    Merge remote-tracking branch 'pinkavaj/vect_integrate-00'

 gr-blocks/grc/blocks_integrate_xx.xml              | 10 +++++++++-
 gr-blocks/include/gnuradio/blocks/integrate_XX.h.t |  2 +-
 gr-blocks/lib/integrate_XX_impl.cc.t               | 23 +++++++++++++---------
 gr-blocks/lib/integrate_XX_impl.h.t                |  4 ++--
 gr-blocks/python/blocks/qa_integrate.py            | 22 +++++++++++++++++++++
 5 files changed, 48 insertions(+), 13 deletions(-)