[Commit-gnuradio] git://gnuradio.org/jblum branch, uhd, created. 22bc2fabead56a409315d6e7632494140680de36

[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, uhd has been created
        at  22bc2fabead56a409315d6e7632494140680de36 (commit)

- Log -----------------------------------------------------------------
commit 22bc2fabead56a409315d6e7632494140680de36
Merge: 61d57743c708c8cec9b0137427e6aa709a954443 
c6e8a20c39357dc12bf28030a1bb0c36596403b9
Author: Josh Blum <address@hidden>
Date:   Tue Jul 6 17:17:03 2010 -0700

    Merge branch 'uhd_mimo' into uhd

commit c6e8a20c39357dc12bf28030a1bb0c36596403b9
Author: Josh Blum <address@hidden>
Date:   Tue Jul 6 17:05:38 2010 -0700

    uhd: added callbacks in the mimo grc blocks

commit 2a43a733070da86cc321b2ae98c88951933e7b4a
Author: Josh Blum <address@hidden>
Date:   Tue Jul 6 15:45:30 2010 -0700

    uhd: mimo source and sink, stream in future, and lock the clocks

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 26cf4db8892b43ff8c085589c2fefe2a8e228dde
Author: Josh Blum <address@hidden>
Date:   Sun Jul 4 20:22:35 2010 -0700

    uhd: added call to readback time registers, work on locking clocks in mimo 
config

commit 4e636b2b4bb29d5224aeff4ae79af121020338f1
Author: Josh Blum <address@hidden>
Date:   Fri Jul 2 18:30:31 2010 -0700

    uhd mimo: created mimo source and sink block for gr-uhd

commit 1e71bdae9956d64e06bdfbb0c87530619807e100
Author: Josh Blum <address@hidden>
Date:   Wed Jun 30 10:12:02 2010 -0700

    uhd: added calls to set time and clock config

commit 029b856c75b683fc9297fc3b15f4a81c1fc7db9e
Merge: c7593e94007f9e4b5de8c5db62ad09e8a99b2635 
95027c952aa1b8bca0d6795071f7b375d69350d0
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 24 18:45:25 2010 -0700

    Merge branch 'master' into next
    
    * master:
      grc: move grc_setup_freedesktop into libexec directory (not in users 
path).

commit 95027c952aa1b8bca0d6795071f7b375d69350d0
Author: Josh Blum <address@hidden>
Date:   Sat May 29 00:45:26 2010 -0700

    grc: move grc_setup_freedesktop into libexec directory (not in users path).
    
    Renamed grc desktop file to simplify name and updated install script.

commit c7593e94007f9e4b5de8c5db62ad09e8a99b2635
Merge: 36389a6f6c5c84599757a140c83e59372f0350c9 
5cc3614abac37d9adc1923dbf9211bc67e73a167
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 24 16:44:51 2010 -0700

    Merge branch 'master' into next
    
    * master:
      added python script to fix copyright years based on git log
      grc: expanded nports ability to have multiple port duplicators per side

commit 5cc3614abac37d9adc1923dbf9211bc67e73a167
Author: Josh Blum <address@hidden>
Date:   Tue Jun 1 10:26:07 2010 -0700

    added python script to fix copyright years based on git log

commit 8d6a4a06cde05c4b8d97b91bc39521e577d28a22
Author: Josh Blum <address@hidden>
Date:   Wed Jun 23 18:46:05 2010 -0700

    grc: expanded nports ability to have multiple port duplicators per side

commit 36389a6f6c5c84599757a140c83e59372f0350c9
Merge: 76eabccf014dfd1a055f2797179e3a4c0fe21d37 
ec8ef957565226ec98830192544d7d5da68dbe23
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 22 07:45:21 2010 -0700

    Merge branch 'master' into next

commit ec8ef957565226ec98830192544d7d5da68dbe23
Merge: f92f8aae6746fa8fad1d6721fe1a8583295b38e1 
f23a2b33ca1bebf0c3a5fa26fdcff11827744b77
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 22 07:18:47 2010 -0700

    Merge branch 'patches/marcus/fftw'
    
    * patches/marcus/fftw:
      gnuradio-core: allows configuring FFTW to use ESTIMATE vs. MEASURE

commit f92f8aae6746fa8fad1d6721fe1a8583295b38e1
Merge: f108f96074a7699f87d80dbd1a5bbc7c2170d1db 
4c8cda27d86d400e60358f6ad342827bab9d3fdc
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 22 06:53:16 2010 -0700

    Merge branch 'patches/marcus/gr_and_const'
    
    * patches/marcus/gr_and_const:
      grc: adds gr.and_const to block tree

commit 76eabccf014dfd1a055f2797179e3a4c0fe21d37
Merge: 231609db08ccd0fc7bc8bd3282c4309b19e5f596 
f108f96074a7699f87d80dbd1a5bbc7c2170d1db
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 21 17:05:37 2010 -0700

    Merge branch 'master' into next
    
    * master:
      Add RFX2200 to burn-db-eeprom
      Copy paste for RFX2200 in USRP2
      Copy paste for RFX2200 in USRP1

commit f108f96074a7699f87d80dbd1a5bbc7c2170d1db
Author: Jason Abele <address@hidden>
Date:   Mon Jun 21 16:03:55 2010 -0700

    Add RFX2200 to burn-db-eeprom

commit 313361a2cdf79533a6f8d7f951657d69ad27d571
Author: Jason Abele <address@hidden>
Date:   Fri Jun 18 14:11:06 2010 -0700

    Copy paste for RFX2200 in USRP2

commit 57d0cc850cc127ca19d9e209a8444807cd08cae9
Author: Jason Abele <address@hidden>
Date:   Fri Jun 18 14:00:00 2010 -0700

    Copy paste for RFX2200 in USRP1

commit 231609db08ccd0fc7bc8bd3282c4309b19e5f596
Merge: ec7e995ca213a293ff5e068068ffd04e6b7ee7b1 
55d030b88e6f5b8440a1ea37575806d8c997735b
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 21 12:23:42 2010 -0700

    Merge branch 'master' into next
    
    * master:
      grc: fix broken variable config when using bool type

commit 55d030b88e6f5b8440a1ea37575806d8c997735b
Merge: e20160b7cc480176ba629ebfbe9fb073963c25d3 
0bc11568d20e2b2215dc072f70f947db07b1ce9c
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jun 21 12:23:36 2010 -0700

    Merge branch 'maint'
    
    * maint:
      grc: fix broken variable config when using bool type

commit 0bc11568d20e2b2215dc072f70f947db07b1ce9c
Author: Johann Chiang <address@hidden>
Date:   Mon Jun 21 12:20:54 2010 -0700

    grc: fix broken variable config when using bool type

commit ec7e995ca213a293ff5e068068ffd04e6b7ee7b1
Merge: e19404263e08fce0259069a311e321ed5277e16d 
e20160b7cc480176ba629ebfbe9fb073963c25d3
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 19 11:32:18 2010 -0700

    Merge branch 'master' into next
    
    * master:
      gr-usrp2: implement start_streaming_at(usrp2::fpga_timestamp time)

commit e20160b7cc480176ba629ebfbe9fb073963c25d3
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 19 11:27:56 2010 -0700

    gr-usrp2: implement start_streaming_at(usrp2::fpga_timestamp time)
    
    This new method on usrp2.sink_* causes the first TX sample data to be
    sent at the FPGA clock time specified, with all further data immediately
    following.
    
    u = usrp2.sink_32fc() # or 16sc
    ...configure sink here...
    u.sync_to_pps()
    ...delay a second for PPS to have happened
    u.start_streaming_at(int(100e6)) # start TX stream one second later
    ...start flowgraph here...
    
    If this function is not called, all transmit data will be sent
    immediately (the prior behavior).

commit e19404263e08fce0259069a311e321ed5277e16d
Merge: d4766ba22b22a3f7730f8bcb32cd0d71422f96a8 
f0b3dab8125979630651e8d016be296ae607c641
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jun 13 14:18:27 2010 -0700

    Merge branch 'master' into next
    
    * master:
      Fixes gr-qtgui make distcheck failure when QT is not installed.

commit f0b3dab8125979630651e8d016be296ae607c641
Merge: 0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07 
51416adfdc330fe0d4edbfcd5df839de66ef2759
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jun 13 14:18:20 2010 -0700

    Merge branch 'maint'
    
    * maint:
      Fixes gr-qtgui make distcheck failure when QT is not installed.

commit 51416adfdc330fe0d4edbfcd5df839de66ef2759
Merge: c85f8b729f397dbe938630da5d47b85977e78215 
b23cc175656c0507ee4f45a065bc48ab0f85095f
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jun 13 11:59:13 2010 -0700

    Merge remote branch 'trondeau/qtmake' into maint
    
    * trondeau/qtmake:
      Fixes gr-qtgui make distcheck failure when QT is not installed.

commit b23cc175656c0507ee4f45a065bc48ab0f85095f
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 13 14:31:11 2010 -0400

    Fixes gr-qtgui make distcheck failure when QT is not installed.

commit d4766ba22b22a3f7730f8bcb32cd0d71422f96a8
Merge: 42321e57612176b828edeb8334f17f1434c2828b 
0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 4 23:02:03 2010 -0700

    Merge branch 'master' into next
    
    * master:
      Fixed WBX RX PLL enable
      Refactor WBX and adf4350 to avoid passing usrp pointer
      Clean up annoying class structure in wbx
      Fixing wbx to use _refclk_freq()
      Typo in error message

commit 0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07
Merge: d784c4321114a83454493337393c5e2f5656e1e9 
c85f8b729f397dbe938630da5d47b85977e78215
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 4 23:01:56 2010 -0700

    Merge branch 'maint'
    
    * maint:
      Fixed WBX RX PLL enable
      Refactor WBX and adf4350 to avoid passing usrp pointer
      Clean up annoying class structure in wbx
      Fixing wbx to use _refclk_freq()
      Typo in error message

commit c85f8b729f397dbe938630da5d47b85977e78215
Merge: 34bf49d06e6b5e48c08d92e2b9e0794512fa761f 
5fc7083812b85a7f3e65daff8e879ef7521f5122
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jun 4 22:40:14 2010 -0700

    Merge branch 'fix/wbx_refclock' into maint
    
    * fix/wbx_refclock:
      Fixed WBX RX PLL enable
      Refactor WBX and adf4350 to avoid passing usrp pointer
      Clean up annoying class structure in wbx
      Fixing wbx to use _refclk_freq()
      Typo in error message

commit 5fc7083812b85a7f3e65daff8e879ef7521f5122
Author: Jason Abele <address@hidden>
Date:   Fri Jun 4 15:34:27 2010 -0700

    Fixed WBX RX PLL enable

commit 937b74e9f60a2668a6f39f7f5d7291a8e00aef1f
Author: Jason Abele <address@hidden>
Date:   Thu Jun 3 14:35:18 2010 -0700

    Refactor WBX and adf4350 to avoid passing usrp pointer

commit 9004b4524713992660012d7932f6dcace74e54b0
Author: Jason Abele <address@hidden>
Date:   Thu Jun 3 13:25:42 2010 -0700

    Clean up annoying class structure in wbx

commit 1e44cf9e9c46c83e9acde104478fa2bd9acadc35
Author: Jason Abele <address@hidden>
Date:   Thu Jun 3 12:49:03 2010 -0700

    Fixing wbx to use _refclk_freq()

commit cf80eaf2502f3ff8a0bac13ee1a456baddfa7d42
Author: Jason Abele <address@hidden>
Date:   Thu Jun 3 12:24:13 2010 -0700

    Typo in error message

commit 42321e57612176b828edeb8334f17f1434c2828b
Merge: ba0a21798e0d59ac54454908e4dabeac5783f731 
d784c4321114a83454493337393c5e2f5656e1e9
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 3 00:31:30 2010 -0700

    Merge branch 'master' into next
    
    Merge made by '-s ours'

commit d784c4321114a83454493337393c5e2f5656e1e9
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jun 3 00:31:19 2010 -0700

    Update revision to 3.3.1git

commit 34bf49d06e6b5e48c08d92e2b9e0794512fa761f
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 2 23:56:20 2010 -0700

    Update revision to 3.3.0

commit ba0a21798e0d59ac54454908e4dabeac5783f731
Merge: 483681462b8138f048746502b72982d8bc5730b0 
b3bd2c61d615ba01f1fb97819461b057190e1632
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 2 16:42:26 2010 -0700

    Merge branch 'master' into next
    
    * master:
      gcell: make versioned libraries
      gnuradio-core: fix missing linker flags for boost_program_options
      howto: fix incorrect include path
      build: redo GR_GIT for portability
      build: use date format string instead of -R for portability
      gnuradio-core: fix typo in doxygen header
      gr-qtgui: add include file for gcc 4.4.1

commit b3bd2c61d615ba01f1fb97819461b057190e1632
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 2 15:24:57 2010 -0700

    gcell: make versioned libraries

commit ae008c6e182808a0a37a9597e814c9825f124af1
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 2 15:19:32 2010 -0700

    gnuradio-core: fix missing linker flags for boost_program_options

commit 8d20fe0fa5c255a70723d3de4d8e023a4f9f4f48
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 2 09:08:34 2010 -0700

    howto: fix incorrect include path

commit 35940091f03b80c2611bcbeca0da343a4371f7c1
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jun 2 08:47:13 2010 -0700

    build: redo GR_GIT for portability

commit 1badda02acc4d67409c29447ba20c51d2849bd9e
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 1 18:07:26 2010 -0700

    build: use date format string instead of -R for portability

commit 45ff82b3d099e39e435f829413923abbcfacfd58
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 1 09:16:23 2010 -0700

    gnuradio-core: fix typo in doxygen header

commit 3916490b4d88dd6facc3e5c821a9672e0b4b55c4
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jun 1 09:11:20 2010 -0700

    gr-qtgui: add include file for gcc 4.4.1

commit 483681462b8138f048746502b72982d8bc5730b0
Merge: 48d04419f5de8309e7f26cca15c1ba1a70d8ea7b 
944a8b6f031aaf1cdc67cc5bd79b61f75e105100
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 30 23:18:50 2010 -0700

    Merge branch 'master' into next
    
    * master:
      Update revision to 3.3.0-rc3
    
    Merge made by '-s ours' to skip over commit 944a8b6f

commit 944a8b6f031aaf1cdc67cc5bd79b61f75e105100
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 30 23:18:04 2010 -0700

    Update revision to 3.3.0-rc3

commit 48d04419f5de8309e7f26cca15c1ba1a70d8ea7b
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 30 23:11:00 2010 -0700

    vrt: make versioned libraries

commit 8aea15e3a93821bdc43e9376cc27f3ab0ed48e87
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 30 23:09:57 2010 -0700

    gr-uhd: make versioned libraries

commit edb46cf12cc2a7327b1d6d4dd9422b8f0f3529cc
Merge: 4fb81dbcbb1416a954740555882f496a9d086d14 
b98cabac11306fa25c29a2e0adc1c0c0a697e9a0
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 30 23:08:32 2010 -0700

    Merge branch 'master' into next
    
    * master:
      howto: make versioned libraries
      Make C++ shared libraries versioned
      build: refactor GR_GIT and GR_VERSION
    
    Update howto revision to 3.4git

commit b98cabac11306fa25c29a2e0adc1c0c0a697e9a0
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 30 23:06:20 2010 -0700

    howto: make versioned libraries

commit ad13c00ae8cba6327851652a7d0c94a6d6316916
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 28 20:02:38 2010 -0700

    Make C++ shared libraries versioned

commit 745670bc73d364a25d39b31d89daece8dba48160
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 28 08:14:05 2010 -0700

    build: refactor GR_GIT and GR_VERSION

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

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

    gnuradio-core: allows configuring FFTW to use ESTIMATE vs. MEASURE

commit 4c8cda27d86d400e60358f6ad342827bab9d3fdc
Author: Marcus D Leech <address@hidden>
Date:   Sun May 16 08:16:39 2010 -0700

    grc: adds gr.and_const to block tree

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


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