aboutsummaryrefslogtreecommitdiffstats
path: root/fpga/usrp2/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fpga_master'Josh Blum2012-07-027-0/+4011
|
* Merge branch 'fpga_next' into uhd_nextJosh Blum2011-06-1415-0/+4813
|
* Merge branch 'next' into use_vita_lengthJosh Blum2011-05-091-0/+83
|
* Merge branch 'usrp_e100' into nextJosh Blum2010-11-232-0/+227
|\ | | | | | | | | Conflicts: images/Makefile
| * Merge branch 'ue1_rev2' into usrp_e_nextJosh Blum2010-10-272-0/+227
| |
* | Merge branch 'flow_control' into flow_ctrlJosh Blum2010-10-141-0/+301
|/
* moved usrp1 and usrp2 fpga dirs into fpga subdirectoryJosh Blum2010-04-1520-0/+8493