Commit graph

3 commits

Author SHA1 Message Date
Josh Blum
4226748ddd Merge branch 'fpga_master' into uhd_master
Conflicts:
	fpga/usrp1/toplevel/usrp_std/usrp_std.v
2011-09-28 13:27:33 -07:00
Josh Blum
abb57f8661 usrp1: fix path to firmware files for fpga top level 2011-04-07 15:45:03 -05:00
Josh Blum
05d77f7723 moved usrp1 and usrp2 fpga dirs into fpga subdirectory 2010-04-15 11:24:24 -07:00