Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fpga_next' into next | Josh Blum | 2012-03-23 | 1 | -3/+1 |
| | |||||
* | fpga: squashed new_work fpga changes onto uhd next | Josh Blum | 2011-07-19 | 12 | -4177/+3 |
| | |||||
* | Merge branch 'fpga_next' into next | Josh Blum | 2011-07-08 | 12 | -3/+4177 |
| | |||||
* | uhd: removed deleted fpga files removed from fpga repo | Josh Blum | 2011-01-19 | 3 | -15/+0 |
| | |||||
* | uhd: added new hardware to readme | Josh Blum | 2010-11-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fpga_next' into next | Josh Blum | 2010-11-23 | 24 | -3/+4765 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: fpga/usrp2/top/u1e_passthru/.gitignore fpga/usrp2/top/u1e_passthru/Makefile fpga/usrp2/top/u2plus/.gitignore fpga/usrp2/top/u2plus/Makefile usrp2/top/u1e_passthru/.gitignore usrp2/top/u1e_passthru/Makefile | ||||
| * | fpga: performed a forceful checkout of fpga to overwrite with current fpga code | Josh Blum | 2010-11-23 | 21 | -3/+4750 |
|/ | |||||
* | Merge branch 'flow_control' into flow_ctrl | Josh Blum | 2010-10-14 | 21 | -10/+1094 |
| | |||||
* | Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master | Josh Blum | 2010-06-15 | 1 | -0/+19 |
| | | | | | Conflicts: fpga/.gitignore | ||||
* | Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into work | Josh Blum | 2010-05-18 | 8 | -0/+514 |
| | |||||
* | moved usrp1 and usrp2 fpga dirs into fpga subdirectory | Josh Blum | 2010-04-15 | 48 | -0/+3055 |