[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'bastib
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'bastibl/rayleigh_fading' into next |
Date: |
Sun, 14 Feb 2016 16:33:14 +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 4aabba72f0d268174855fce97a80bd55acb1358c
Merge: 46f3ee7 9753ff4
Author: Johnathan Corgan <address@hidden>
Date: Sun Feb 14 08:27:10 2016 -0800
Merge remote-tracking branch 'bastibl/rayleigh_fading' into next
gr-channels/lib/fading_model_impl.cc | 11 -----------
gr-channels/lib/flat_fader_impl.cc | 18 +++++++++---------
2 files changed, 9 insertions(+), 20 deletions(-)