[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: |
Mon, 24 Nov 2014 23:23:22 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 3c060c358ad8f8ea179a6b6adc31be0310d1c16a
Merge: 0fc88b0 b2e6c0f
Author: Tom Rondeau <address@hidden>
Date: Mon Nov 24 18:21:48 2014 -0500
Merge branch 'master' into next
gr-fft/include/gnuradio/fft/window.h | 23 +++++++++++++++++++----
gr-fft/lib/window.cc | 20 +++++++++++++++++++-
2 files changed, 38 insertions(+), 5 deletions(-)