[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'github
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'github/blocks_cleanup' |
|
Date: |
Sat, 4 Apr 2015 17:39:31 +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 e16f9489d71720e8a9d9ec37ced0c033a99c87aa
Merge: ed242b2 432b76e
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 4 09:52:47 2015 -0700
Merge remote-tracking branch 'github/blocks_cleanup'
gr-blocks/grc/blocks_repack_bits_bb.xml | 3 +-
gr-blocks/lib/pdu_to_tagged_stream_impl.cc | 18 +++++-----
gr-blocks/lib/repack_bits_bb_impl.cc | 6 ++--
gr-blocks/lib/tagged_stream_mux_impl.cc | 25 +++++++-------
.../gnuradio/digital/correlate_and_sync_cc.h | 11 +++----
.../gnuradio/digital/packet_header_default.h | 38 ++++++++++------------
6 files changed, 49 insertions(+), 52 deletions(-)
- [Commit-gnuradio] [gnuradio] branch master updated (6afc40e -> e16f948), git, 2015/04/04
- [Commit-gnuradio] [gnuradio] 05/08: Merge branch 'maint', git, 2015/04/04
- [Commit-gnuradio] [gnuradio] 06/08: Merge remote-tracking branch 'mfischer/micro_cleanup', git, 2015/04/04
- [Commit-gnuradio] [gnuradio] 01/08: runtime: cleanup: Removing leftovers., git, 2015/04/04
- [Commit-gnuradio] [gnuradio] 02/08: qtgui: cherry-pick the range slide starting point bug fix, git, 2015/04/04
- [Commit-gnuradio] [gnuradio] 03/08: qtqui: fixed notches on knob, git, 2015/04/04
- [Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'github/blocks_cleanup',
git <=
- [Commit-gnuradio] [gnuradio] 07/08: Merge remote-tracking branch 'tkoehn/additional_fix', git, 2015/04/04
- [Commit-gnuradio] [gnuradio] 04/08: blocks: misc. formatting cleanups, git, 2015/04/04