[Commit-gnuradio] git://gnuradio.org/jblum branch, next, created. 61d57743c708c8cec9b0137427e6aa709a954443

[git repository hosting]

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/jblum".

The branch, next has been created
        at  61d57743c708c8cec9b0137427e6aa709a954443 (commit)

- Log -----------------------------------------------------------------
commit 61d57743c708c8cec9b0137427e6aa709a954443
Merge: 1e71bdae9956d64e06bdfbb0c87530619807e100 
278b6db3de99ae31d5f4f79dcd62708c4757d7fa
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 5 12:01:29 2010 -0700

    Merge branch 'master' into next

commit 278b6db3de99ae31d5f4f79dcd62708c4757d7fa
Merge: 41c222c05eb0e3f36cf5a0e328eead58e77e3a8b 
272c44f10ebf9e2d7ac76fe00c87382a1c0f4f29
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 5 12:01:09 2010 -0700

    Merge branch 'maint'

commit 272c44f10ebf9e2d7ac76fe00c87382a1c0f4f29
Author: Moritz Fischer <address@hidden>
Date:   Mon Jul 5 11:55:56 2010 -0700

    gr-utils: fix out of tree project generator to properly update tarfile name

commit 7361b03b245776938f0576435e3ccf4806622e3e
Author: Catalin Patulea <address@hidden>
Date:   Mon Jul 5 11:45:52 2010 -0700

    gr-wxgui: fix non-gl scope sink only updating one channel
    
    This fixes a bug where, when using nongl scopesink, only the real part
    of a complex input is shown. After applying this patch, both Ch1 and
    Ch2 can be seen on the scope display.

commit 41c222c05eb0e3f36cf5a0e328eead58e77e3a8b
Merge: 8a4ef7ce3c1028454a357b38b1ddb0af0b54d604 
dc79a11cb809b33f397603e7641b155120be9ee8
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 5 10:43:40 2010 -0700

    Merge branch 'patches/marcus/stripchart'
    
    Conflicts:
        gr-wxgui/src/python/scope_window.py
    
    * Adds new scope window trigger, TRIG_MODE_STRIPCHART
    * Allows config file selection of whether background window sinks still run
    * Allows config file selection of default trigger mode
    * Allows config file selection of default waterfall sink color mode
    
    [wxgui]
    #Setting this to true prevents the window sinks from stopping when they
    #are not displayed, as when they are in a notebook with a hidden tab.
    run_always = False
    
    # Default scope trigger mode.
    #
    # 0 = Freerun
    # 1 = Auto (default)
    # 2 = Normal
    # 3 = Stripchart
    trig_mode = 1
    
    # Default waterfall sink color mode.  Valid choices are 'rgb1', 'rbg2',
    # 'rgb3', or 'gray'
    waterfall_color = rgb1

commit 8a4ef7ce3c1028454a357b38b1ddb0af0b54d604
Merge: 95027c952aa1b8bca0d6795071f7b375d69350d0 
277e1c0a0881b359f9d597e1cb6a4e3725356387
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 5 11:36:26 2010 -0500

    Merge branch 'patches/marcus/file_sink'

commit dc79a11cb809b33f397603e7641b155120be9ee8
Author: Marcus D Leech <address@hidden>
Date:   Sun May 16 08:44:16 2010 -0700

    gr-wxgui: adds stripchart trigger mode to graphics sinks

commit 277e1c0a0881b359f9d597e1cb6a4e3725356387
Author: Marcus D Leech <address@hidden>
Date:   Sun May 16 08:38:30 2010 -0700

    gnuradio-core: adds configurable flush to file sink

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


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