[Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'tom/blocks/peak_detector2_docs'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 9255e7c7a945e65e3b8317ee1e1782ff2e69f8b1
Merge: 521fa75 636947d
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 29 15:29:42 2015 -0700

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

 .../include/gnuradio/blocks/peak_detector2_fb.h    | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)