uhd - Ettus' UHD Repository

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fpga_next' into next	Josh Blum	2010-11-23	65	-878/+7961
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	121	-1085/+11263
\| \|
* \|	Merge branch 'usrp_e100' into next	Josh Blum	2010-11-23	64	-215/+3325
\|\ \ \| \|/ \|/\| \| \| \| \|	Conflicts: images/Makefile
\| *	Merge branch 'ue1_rev2' into usrp_e_next	Josh Blum	2010-10-27	64	-215/+3325
\| \|
* \|	Merge branch 'flow_control_fpga' into flow_ctrl	Josh Blum	2010-10-22	7	-115/+304
\| \|
* \|	Merge branch 'flow_control' into flow_ctrl	Josh Blum	2010-10-14	57	-256/+10817
\|/
*	Merge branch 'ise12' into next	Josh Blum	2010-08-31	3	-29/+23
\|
*	Merge branch 'tx_policy' of ettus.sourcerepo.com:ettus/fpgapriv into premerge	Nick Foster	2010-08-16	1	-1/+1
\|
*	Merge branch 'features' into uhd_fpga_features	Josh Blum	2010-08-09	2	-3/+6
\|
*	Merge branch 'features' into uhd_fpga_features	Josh Blum	2010-08-09	23	-5878/+873
\| \| \| \| \|	Conflicts: fpga/usrp2/vrt/vita_rx_control.v
*	Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_merge	Josh Blum	2010-07-05	1	-4/+5
\|
*	Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_fpga_merge	Josh Blum	2010-06-24	1	-1/+2
\|
*	Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master	Josh Blum	2010-06-15	268	-901/+1835
\| \| \| \| \|	Conflicts: fpga/.gitignore
*	Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpga into work	Josh Blum	2010-05-18	22	-2090/+554
\|
*	Merge branch 'shrinkfw' into usrp2	Josh Blum	2010-05-10	1	-6/+18
\|\
\| *	Added reload flag to the stream cmd.	Josh Blum	2010-04-28	1	-6/+18
\| \| \| \| \| \| \| \| \| \|	This reloads the last command to handle continuous streaming in hardware. Moved rx control register setup and stream command issuing to the host.
* \|	Merge branch 'udp' of git@ettus.sourcerepo.com:ettus/fpgapriv	Josh Blum	2010-05-10	6	-32/+47
\|/
*	Merge branch 'udp'	Josh Blum	2010-04-15	871	-0/+1586299
\|\
\| *	moved usrp1 and usrp2 fpga dirs into fpga subdirectory	Josh Blum	2010-04-15	871	-0/+1586299
\|
*	Reorganized structure into include, lib, test, firmware, fpga.	Josh Blum	2010-01-12	1	-0/+4
	The fpga and firmware are empty placeholders for now.