[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: |
Wed, 23 Jul 2014 16:15:13 +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 a9cf4ab022d5eb5e06b283f0f43af24d44d3bc60
Merge: 5284b5d 3751ea9
Author: Tom Rondeau <address@hidden>
Date: Wed Jul 23 12:14:38 2014 -0400
Merge branch 'master' into next
CMakeLists.txt | 8 +-
cmake/Modules/GrBuildTypes.cmake | 158 +++++++++++++++++++++++++++++++++++++++
2 files changed, 164 insertions(+), 2 deletions(-)