[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'maint' |
|
Date: |
Thu, 24 Dec 2015 03:09:07 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 591366e78392a3c3d5fedeace6c135f98f7aac4c
Merge: 4b64571 fa6f3e4
Author: Johnathan Corgan <address@hidden>
Date: Wed Dec 23 18:32:11 2015 -0800
Merge branch 'maint'
Conflicts:
volk
cmake/Modules/FindThrift.cmake | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)