diff options
author | Matt Ettus <matt@ettus.com> | 2010-05-18 15:01:09 -0700 |
---|---|---|
committer | Matt Ettus <matt@ettus.com> | 2010-05-18 15:01:09 -0700 |
commit | ec0f7e9afdae0136752062e5bceb50e1c68d985f (patch) | |
tree | 44cac2de7f336772abb9bbf2d5e4e285b0dfb435 /usrp2/opencores/spi_boot/doc/src | |
parent | ac32c1fef042a3041a37a8c68e505156cba31484 (diff) | |
parent | 621ad7cc9e68b4e304b616d8f840d3a03a047c8b (diff) | |
download | uhd-ec0f7e9afdae0136752062e5bceb50e1c68d985f.tar.gz uhd-ec0f7e9afdae0136752062e5bceb50e1c68d985f.tar.bz2 uhd-ec0f7e9afdae0136752062e5bceb50e1c68d985f.zip |
Merge branch 'master' into udp
Remove CVS files, warning removal on setting reg width, aeMB synthesis pragmas
Conflicts:
usrp2/control_lib/setting_reg.v
usrp2/top/u2_core/u2_core.v
usrp2/top/u2_rev3/Makefile
Diffstat (limited to 'usrp2/opencores/spi_boot/doc/src')
-rw-r--r-- | usrp2/opencores/spi_boot/doc/src/CVS/Entries | 10 | ||||
-rw-r--r-- | usrp2/opencores/spi_boot/doc/src/CVS/Repository | 1 | ||||
-rw-r--r-- | usrp2/opencores/spi_boot/doc/src/CVS/Root | 1 | ||||
-rw-r--r-- | usrp2/opencores/spi_boot/doc/src/CVS/Template | 0 |
4 files changed, 0 insertions, 12 deletions
diff --git a/usrp2/opencores/spi_boot/doc/src/CVS/Entries b/usrp2/opencores/spi_boot/doc/src/CVS/Entries deleted file mode 100644 index b2d32af23..000000000 --- a/usrp2/opencores/spi_boot/doc/src/CVS/Entries +++ /dev/null @@ -1,10 +0,0 @@ -/architecture.eps/1.4/Thu Apr 14 21:18:11 2005/-kb/ -/architecture.fig/1.4/Thu Apr 14 21:18:11 2005/-kb/ -/initialization.eps/1.2/Thu Mar 16 15:41:16 2006/-kb/ -/initialization.fig/1.2/Thu Mar 16 15:41:16 2006/-kb/ -/memory_organization.eps/1.2/Thu Mar 16 16:50:57 2006/-kb/ -/memory_organization.fig/1.2/Thu Mar 16 16:50:57 2006/-kb/ -/spi_boot.sxw/1.6/Thu Mar 16 17:09:31 2006/-kb/ -/transfer.eps/1.1/Sun Feb 27 19:24:30 2005/-kb/ -/transfer.fig/1.1/Sun Feb 27 19:24:35 2005/-kb/ -D diff --git a/usrp2/opencores/spi_boot/doc/src/CVS/Repository b/usrp2/opencores/spi_boot/doc/src/CVS/Repository deleted file mode 100644 index 5f8aafef8..000000000 --- a/usrp2/opencores/spi_boot/doc/src/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -spi_boot/doc/src diff --git a/usrp2/opencores/spi_boot/doc/src/CVS/Root b/usrp2/opencores/spi_boot/doc/src/CVS/Root deleted file mode 100644 index 44b2aa23b..000000000 --- a/usrp2/opencores/spi_boot/doc/src/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/usrp2/opencores/spi_boot/doc/src/CVS/Template b/usrp2/opencores/spi_boot/doc/src/CVS/Template deleted file mode 100644 index e69de29bb..000000000 --- a/usrp2/opencores/spi_boot/doc/src/CVS/Template +++ /dev/null |