aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp1/sdr_lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-09-284-8/+8
| | | | | Conflicts: fpga/usrp1/toplevel/usrp_std/usrp_std.v
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-1552-0/+3521