aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/vrt/Makefile.srcs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'features' into uhd_fpga_featuresJosh Blum2010-08-091-0/+2
| | | | | Conflicts: fpga/usrp2/vrt/vita_rx_control.v
* Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_masterJosh Blum2010-06-151-0/+13
Conflicts: fpga/.gitignore