[Commit-gnuradio] git://gnuradio.org/jcorgan-uhd branch, user-reg, created. 3694d9c866b3b9c5b0bec0d5dc3b2c7900452555

[git version control]

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/jcorgan-uhd".

The branch, user-reg has been created
        at  3694d9c866b3b9c5b0bec0d5dc3b2c7900452555 (commit)

- Log -----------------------------------------------------------------
commit 3694d9c866b3b9c5b0bec0d5dc3b2c7900452555
Merge: 3e6d07d b8e41cb
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 25 09:47:06 2012 -0800

    Merge remote branch 'ettus/master' into user-reg
    
    Conflicts:
        fpga/usrp2/control_lib/Makefile.srcs
        host/cmake/Modules/UHDVersion.cmake
        host/examples/tx_waveforms.cpp
        host/lib/usrp/e100/e100_impl.cpp
        host/lib/usrp/e100/e100_impl.hpp
        host/lib/usrp/multi_usrp.cpp
        host/lib/usrp/usrp2/usrp2_impl.hpp

commit 3e6d07dcef6a07b4ba58beca09318f179cfe3a7a
Merge: 5c2a8aa 97bd77e
Author: Johnathan Corgan <address@hidden>
Date:   Fri Jan 13 07:37:01 2012 -0800

    Merge commit 'release_003_003_002' into set-user-register

commit 5c2a8aade35b83bdfe958b0519281746169667a9
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 10 13:26:56 2012 -0800

    Add set_user_register() to UHD API host code
    
    * Implementations for E1x0, N2x0

commit 030c759550cef47a3e9321e92165e71ad299b60a
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jan 8 14:50:45 2012 -0800

    fpga: create user settings bus

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


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