aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/top/B100/Makefile.u1plus
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-09-281-0/+98
Conflicts: fpga/usrp1/toplevel/usrp_std/usrp_std.v