diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-15 18:24:33 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-15 18:24:33 -0700 |
| commit | edcc2df10ba59ed91ac9513c2dc1d36e155caaec (patch) | |
| tree | 1a1ec2c0b5500990c991c27af03dbe48c10ce7ca /fpga/usrp2/opencores/spi/bench | |
| parent | a89d684ba2b81c6e18d348965dffb919edb56fea (diff) | |
| parent | 9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900 (diff) | |
| download | uhd-edcc2df10ba59ed91ac9513c2dc1d36e155caaec.tar.gz uhd-edcc2df10ba59ed91ac9513c2dc1d36e155caaec.tar.bz2 uhd-edcc2df10ba59ed91ac9513c2dc1d36e155caaec.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/fpga into uhd_master
Conflicts:
fpga/.gitignore
Diffstat (limited to 'fpga/usrp2/opencores/spi/bench')
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/CVS/Entries | 1 | ||||
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/CVS/Repository | 1 | ||||
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/CVS/Root | 1 | ||||
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/CVS/Template | 0 | ||||
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/verilog/CVS/Entries | 4 | ||||
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/verilog/CVS/Repository | 1 | ||||
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/verilog/CVS/Root | 1 | ||||
| -rw-r--r-- | fpga/usrp2/opencores/spi/bench/verilog/CVS/Template | 0 |
8 files changed, 0 insertions, 9 deletions
diff --git a/fpga/usrp2/opencores/spi/bench/CVS/Entries b/fpga/usrp2/opencores/spi/bench/CVS/Entries deleted file mode 100644 index 428c5622d..000000000 --- a/fpga/usrp2/opencores/spi/bench/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D/verilog//// diff --git a/fpga/usrp2/opencores/spi/bench/CVS/Repository b/fpga/usrp2/opencores/spi/bench/CVS/Repository deleted file mode 100644 index f45728d0f..000000000 --- a/fpga/usrp2/opencores/spi/bench/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -spi/bench diff --git a/fpga/usrp2/opencores/spi/bench/CVS/Root b/fpga/usrp2/opencores/spi/bench/CVS/Root deleted file mode 100644 index 44b2aa23b..000000000 --- a/fpga/usrp2/opencores/spi/bench/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/fpga/usrp2/opencores/spi/bench/CVS/Template b/fpga/usrp2/opencores/spi/bench/CVS/Template deleted file mode 100644 index e69de29bb..000000000 --- a/fpga/usrp2/opencores/spi/bench/CVS/Template +++ /dev/null diff --git a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Entries b/fpga/usrp2/opencores/spi/bench/verilog/CVS/Entries deleted file mode 100644 index 68404f871..000000000 --- a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Entries +++ /dev/null @@ -1,4 +0,0 @@ -/spi_slave_model.v/1.2/Wed Mar 26 16:00:03 2003// -/tb_spi_top.v/1.6/Mon Mar 15 17:46:04 2004// -/wb_master_model.v/1.1.1.1/Wed Jun 12 15:45:23 2002// -D diff --git a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Repository b/fpga/usrp2/opencores/spi/bench/verilog/CVS/Repository deleted file mode 100644 index 78a3c4a9f..000000000 --- a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -spi/bench/verilog diff --git a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Root b/fpga/usrp2/opencores/spi/bench/verilog/CVS/Root deleted file mode 100644 index 44b2aa23b..000000000 --- a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@cvs.opencores.org:/cvsroot/anonymous diff --git a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Template b/fpga/usrp2/opencores/spi/bench/verilog/CVS/Template deleted file mode 100644 index e69de29bb..000000000 --- a/fpga/usrp2/opencores/spi/bench/verilog/CVS/Template +++ /dev/null |