diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
| commit | fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda (patch) | |
| tree | 107e43e35008e6df0d33b0e8a8f5f52d28a91493 /host/lib/ic_reg_maps | |
| parent | 4711829f03ee2fcd1c4e9dc2a353af0e35497180 (diff) | |
| parent | 7b0b2924d52bbbcb4660cad5d8070074426011ce (diff) | |
| download | uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.gz uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.bz2 uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.zip | |
Merge branch 'cordic_policy' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'host/lib/ic_reg_maps')
| -rw-r--r-- | host/lib/ic_reg_maps/.gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/host/lib/ic_reg_maps/.gitignore b/host/lib/ic_reg_maps/.gitignore deleted file mode 100644 index 053049d05..000000000 --- a/host/lib/ic_reg_maps/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/*.pyc -/*.pyo |