[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Tue, 10 Nov 2015 15:37:30 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit db9a7dd439b97a4d5c18857670875326e5d86e1b
Merge: 3c5bf08 6a88efb
Author: Johnathan Corgan <address@hidden>
Date: Tue Nov 10 07:22:58 2015 -0800
Merge branch 'master' into next
gr-blocks/grc/blocks_max_xx.xml | 12 +++++--
gr-blocks/grc/blocks_min_xx.xml | 12 +++++--
gr-blocks/include/gnuradio/blocks/max_XX.h.t | 10 ++++--
gr-blocks/include/gnuradio/blocks/min_XX.h.t | 10 ++++--
gr-blocks/lib/max_XX_impl.cc.t | 53 ++++++++++++++++++----------
gr-blocks/lib/max_XX_impl.h.t | 6 ++--
gr-blocks/lib/min_XX_impl.cc.t | 52 +++++++++++++++++----------
gr-blocks/lib/min_XX_impl.h.t | 6 ++--
8 files changed, 106 insertions(+), 55 deletions(-)