[Commit-gnuradio] git://gnuradio.org/jcorgan-uhd tag, usrp1-rrc-3.4.0, created. 9c26fdbd8bd687b91c8b5100881662d3315ef74f

[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 tag, usrp1-rrc-3.4.0 has been created
        at  9c26fdbd8bd687b91c8b5100881662d3315ef74f (commit)

- Log -----------------------------------------------------------------
commit 9c26fdbd8bd687b91c8b5100881662d3315ef74f
Merge: dadc481 d97b9de
Author: Johnathan Corgan <address@hidden>
Date:   Fri Mar 23 15:53:11 2012 -0700

    Merge commit 'release_003_004_000' into rrc
    
    Conflicts:
        host/cmake/Modules/UHDVersion.cmake
        host/examples/tx_waveforms.cpp
        host/lib/usrp/b100/b100_impl.cpp

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


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