diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:40:37 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:40:37 -0700 |
| commit | 893819c87f1cc9e845e29df0c26e1d2d0012b750 (patch) | |
| tree | a300f39af94d6831df2bdee9ea0518dba949bb59 /host/docs/uhd_find_devices.1 | |
| parent | 625724d7f81c214e9955334860a364802be3fda9 (diff) | |
| parent | 6e918dab8c3dbdc9774389812953cc495496a8e8 (diff) | |
| download | uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.tar.gz uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.tar.bz2 uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.zip | |
Merge branch 'master' into vivado
Conflicts:
host/lib/usrp/x300/x300_clock_ctrl.cpp
Diffstat (limited to 'host/docs/uhd_find_devices.1')
| -rw-r--r-- | host/docs/uhd_find_devices.1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/host/docs/uhd_find_devices.1 b/host/docs/uhd_find_devices.1 index dfd5c0751..a29793872 100644 --- a/host/docs/uhd_find_devices.1 +++ b/host/docs/uhd_find_devices.1 @@ -43,6 +43,8 @@ type=b200 | USRP B200, USRP B210 type=e100 | USRP E100, USRP E110 +type=e3x0 | USRP E310 + type=x300 | USRP X300, USRP X310 type=octoclock | OctoClock |