commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.2-395-g2d02b29
Date: Fri, 12 Oct 2012 20:12:41 +0000 (UTC)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, next has been updated
       via  2d02b29a0f712faebd82fc17293f8ccd38045f78 (commit)
       via  03bc909716749d961b89adc4809b4ad1d11ca157 (commit)
       via  2267dee5f36f28004cf844a5e495194edb00a67b (commit)
       via  d2048cb7c850f35ecca85596515363361ccd8f12 (commit)
      from  93f4ca6187c409ab30e41fbdf5dace854d9d4c36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2d02b29a0f712faebd82fc17293f8ccd38045f78
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 12 15:41:50 2012 -0400

    qtgui: fixing qtgui time plot to use sample rate names instead of 
bandwidth/frequency.

commit 03bc909716749d961b89adc4809b4ad1d11ca157
Merge: 93f4ca6 2267dee
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 12 15:28:13 2012 -0400

    Merge branch 'master' into next.
    
    Moved changes to time_sink_{c,f}_impl.cc.
    
    Conflicts:
        gr-qtgui/lib/qtgui_time_sink_c.cc
        gr-qtgui/lib/qtgui_time_sink_f.cc

-----------------------------------------------------------------------

Summary of changes:
 gr-qtgui/grc/qtgui_time_sink_x.xml   |    7 ++++---
 gr-qtgui/include/qtgui/time_sink_c.h |    5 +++--
 gr-qtgui/include/qtgui/time_sink_f.h |    5 +++--
 gr-qtgui/lib/time_sink_c_impl.cc     |   17 +++++++++++++----
 gr-qtgui/lib/time_sink_c_impl.h      |    5 +++--
 gr-qtgui/lib/time_sink_f_impl.cc     |   17 +++++++++++++----
 gr-qtgui/lib/time_sink_f_impl.h      |    5 +++--
 gr-qtgui/lib/timedisplayform.cc      |   19 +++++++------------
 gr-qtgui/lib/timedisplayform.h       |    4 +---
 9 files changed, 50 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
git://gnuradio.org/gnuradio



reply via email to

[Prev in Thread] Current Thread [Next in Thread]