aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/sdr_lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_patch_release' into patch_releaserelease_003_002_002Josh Blum2011-08-151-4/+4
|
* Merge branch 'atr_fix_fpga' into atr_fixrelease_003_002_000Josh Blum2011-07-282-58/+78
|
* fpga: squashed new_work fpga changes onto uhd nextJosh Blum2011-07-192-11/+14
|
* Merge branch 'fpga_next' into nextJosh Blum2011-07-0819-459/+659
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2011-06-1438-0/+646
|
* Merge branch 'next' into use_vita_lengthJosh Blum2011-05-091-21/+5
|
* Merge branch 'ise12' into nextJosh Blum2010-08-311-22/+13
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-091-2/+2
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-153-0/+403
| | | | | Conflicts: fpga/.gitignore
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpgaprivJosh Blum2010-05-102-27/+31
|
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-1564-0/+5130