[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 06/07: Merge branch 'cmake_oe_fixes'
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 06/07: Merge branch 'cmake_oe_fixes' |
Date: |
Mon, 21 Apr 2014 15:00:51 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 4db4831dce1465d459ff1e9f55f27b250d55df46
Merge: f41dd8c fec067d
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 21 09:12:08 2014 -0400
Merge branch 'cmake_oe_fixes'
cmake/Modules/FindICE-3.5.cmake | 36 ++++++++++++++++++++++++++----------
cmake/Toolchains/oe-sdk_cross.cmake | 2 +-
gnuradio-runtime/lib/block.cc | 1 +
3 files changed, 28 insertions(+), 11 deletions(-)
- [Commit-gnuradio] [gnuradio] branch master updated (0bd6bf9 -> a399894), git, 2014/04/21
- [Commit-gnuradio] [gnuradio] 03/07: controlport: allows reset_perf_counters to be called over controlport; gr-perf-monitorx has button to call this., git, 2014/04/21
- [Commit-gnuradio] [gnuradio] 05/07: Merge branch 'maint', git, 2014/04/21
- [Commit-gnuradio] [gnuradio] 07/07: Merge branch 'ctrlport_trigger', git, 2014/04/21
- [Commit-gnuradio] [gnuradio] 01/07: runtime: white space removal., git, 2014/04/21
- [Commit-gnuradio] [gnuradio] 04/07: cmake and build: fixes for cross-compiling to enable ControlPort with ICE., git, 2014/04/21
- [Commit-gnuradio] [gnuradio] 02/07: controlport: adding a 'toggle' interface for ControlPort., git, 2014/04/21
- [Commit-gnuradio] [gnuradio] 06/07: Merge branch 'cmake_oe_fixes',
git <=