[Commit-gnuradio] [gnuradio] 09/16: Merge remote-tracking branch 'willcode/master'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 1f9e84e2d66e60861a41bd8710acfb6e2c59b0c5
Merge: 0cbebe1 c687f24
Author: Johnathan Corgan <address@hidden>
Date:   Fri Sep 19 10:59:09 2014 -0700

    Merge remote-tracking branch 'willcode/master'

 gr-blocks/grc/blocks_abs_xx.xml              | 19 +++++++++----------
 gr-blocks/include/gnuradio/blocks/abs_XX.h.t |  2 +-
 gr-blocks/lib/abs_XX_impl.cc.t               | 13 +++++++------
 gr-blocks/lib/abs_XX_impl.h.t                |  5 ++++-
 4 files changed, 21 insertions(+), 18 deletions(-)