aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/opencores
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-092-11/+21
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-15223-318/+34
| | | | | Conflicts: fpga/.gitignore
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-15331-0/+1515024