[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/03: Merge branch 'maint'
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/03: Merge branch 'maint' |
Date: |
Mon, 24 Feb 2014 23:41:36 +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 43edc292c10c51f5ce771fe94c1acbd325851d99
Merge: 97b12c2 4bbd9a8
Author: Tom Rondeau <address@hidden>
Date: Sun Feb 23 22:13:31 2014 -0500
Merge branch 'maint'
gr-qtgui/include/gnuradio/qtgui/displayform.h | 1 -
gr-qtgui/lib/displayform.cc | 11 +----------
gr-qtgui/lib/freqdisplayform.cc | 2 +-
3 files changed, 2 insertions(+), 12 deletions(-)