aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/top/B100/u1plus.ucf
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_master' into uhd_masterJosh Blum2011-09-281-2/+2
| | | | | Conflicts: fpga/usrp1/toplevel/usrp_std/usrp_std.v
* Merge branch 'fpga_next' into uhd_nextJosh Blum2011-06-141-0/+203