[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/07: Merge branch 'ctrlport_trigger'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 07/07: Merge branch 'ctrlport_trigger' |
|
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 a3998949d9c65076d91e3165733a5abd381ad882
Merge: 4db4831 04295e3
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 21 10:00:36 2014 -0400
Merge branch 'ctrlport_trigger'
gnuradio-runtime/include/gnuradio/basic_block.h | 64 +-
.../include/gnuradio/rpccallbackregister_base.h | 16 +-
.../include/gnuradio/rpcregisterhelpers.h | 756 ++++++++++++++++++---
gnuradio-runtime/lib/block.cc | 5 +
.../lib/controlport/rpcpmtconverters_ice.cc | 17 +-
gnuradio-runtime/lib/top_block.cc | 16 +
.../python/gnuradio/ctrlport/gr-perf-monitorx | 87 ++-
gnuradio-runtime/python/gnuradio/ctrlport/icon.png | Bin 1532 -> 4377 bytes
8 files changed, 802 insertions(+), 159 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 <=
- [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, 2014/04/21