[Commit-gnuradio] [gnuradio] 09/09: Merge remote-tracking branch 'tom/blocks/peak_det_api'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 42c1d6d339139eac1001bbc180907569da5e1702
Merge: 08f00a1 25f8830
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 4 13:38:09 2015 -0800

    Merge remote-tracking branch 'tom/blocks/peak_det_api'

 gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t | 2 +-
 gr-blocks/lib/peak_detector_XX_impl.h.t                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)