aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/top/u2_rev3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ise12' into nextJosh Blum2010-08-312-7/+10
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-091-2/+5
|
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-092-87/+82
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-155-204/+1796
| | | | | Conflicts: fpga/.gitignore
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into workJosh Blum2010-05-181-0/+3
|
* Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpgaprivJosh Blum2010-05-103-4/+15
|
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-154-0/+1084