[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next |
Date: |
Thu, 23 Oct 2014 22:03:23 +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 3f0646e10afb8a1b4dc4a95a9b3922e7222276f1
Merge: 14aaadc 82779dc
Author: Tom Rondeau <address@hidden>
Date: Thu Oct 23 18:02:20 2014 -0400
Merge branch 'master' into next
gr-blocks/lib/multiply_matrix_cc_impl.cc | 2 +-
gr-blocks/lib/multiply_matrix_ff_impl.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)