hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity
3,767 Commits 30 Branches 162 Tags 270 MiB
5918cec1b9
Commit Graph

10 Commits

Author SHA1 Message Date
Josh Blum
07c2e795b2 fpga: squashed new_work fpga changes onto uhd next 2011-07-19 14:18:58 -07:00
Josh Blum
17fabccfe4 Merge branch 'fpga_next' into next 2011-07-08 12:17:54 -07:00
Josh Blum
fbb96ac77f uhd: removed deleted fpga files removed from fpga repo 2011-01-19 19:55:15 -08:00
Josh Blum
eb26e8adb4 uhd: added new hardware to readme 2010-11-23 14:43:02 -08:00
Josh Blum
18ce33d228 Merge branch 'fpga_next' into next 
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
 2010-11-23 13:53:14 -08:00
Josh Blum
bb0572a960 fpga: performed a forceful checkout of fpga to overwrite with current fpga code 2010-11-23 13:36:42 -08:00
Josh Blum
26b7de0ac0 Merge branch 'flow_control' into flow_ctrl 2010-10-14 16:55:56 -07:00
Josh Blum
edcc2df10b Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master 
Conflicts:
	fpga/.gitignore
 2010-06-15 18:24:33 -07:00
Josh Blum
4db60e8d0e Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into work 2010-05-18 18:12:14 -07:00
Josh Blum
05d77f7723 moved usrp1 and usrp2 fpga dirs into fpga subdirectory 2010-04-15 11:24:24 -07:00