aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/maint'Ben Hilburn2014-07-174-13/+24
|\
| * Merge branch 'origin/ashish/rx_pcie_overflows' into maintBen Hilburn2014-07-172-3/+7
| |\
| | * Merge branch 'maint' into ashish/rx_pcie_overflowsAshish Chaudhari2014-07-154-4/+4
| | |\
| | * | x300: Bugfix for overflows on PCIe at 200MS/sAshish Chaudhari2014-06-272-3/+7
| * | | Merge branch 'origin/b200/bug512' into maintBen Hilburn2014-07-171-9/+15
| |\ \ \
| | * | | Enhancement #512: B210: Need an Internal PPSmichael-west2014-06-131-9/+15
| * | | | Merge branch 'origin/n200/bug527' into maintBen Hilburn2014-07-171-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix for BUG #527: N200: 50 Msps results in two tonesmichael-west2014-07-011-1/+2
| |/ / /
* | | | Merge branch 'maint'Ben Hilburn2014-06-304-4/+4
|\| | |
| * | | Fixing help text for --ref argument in some examples. Reported by MarcusBen Hilburn2014-06-304-4/+4
| | |/ | |/|
* | | Merge branch 'maint'Nicholas Corgan2014-06-173-3/+9
|\| |
| * | Merge branch 'origin/b200/bug500' into maint - Fixing B200 phase alignment issueBen Hilburn2014-06-163-3/+9
| |\ \
| | * | - Changed XOR to OR for REG_DSP_RX_MUX flags.michael-west2014-06-121-3/+3
| | * | Fix for BUG #500: B210: RX channels are not phase alignedmichael-west2014-06-063-3/+9
* | | | Merge branch 'maint'Ben Hilburn2014-06-131-0/+3
|\| | |
| * | | Fix issue with "item32" registered size, Bug 466.Ben Hilburn2014-06-131-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | UHD: Addressing Bug 466, as per Balint.Ben Hilburn2014-05-221-0/+3
* | | | b200/docs: Fixed ISE version in docs to 14.4Martin Braun2014-06-061-2/+2
* | | | Merge branch 'maint'Nicholas Corgan2014-06-031-7/+0
|\| | |
| * | | Do not set the mfloat-soft flag during the test for arm_neon.h.Philip Balister2014-06-031-7/+0
* | | | Merge branch 'maint'Nicholas Corgan2014-06-031-1/+1
|\| | |
| * | | cmake: added "libusb-1.0" to the list of library names for libusbNicholas Corgan2014-06-031-1/+1
* | | | Merge branch 'maint'Nicholas Corgan2014-05-271-1/+1
|\| | |
| * | | property_tree: doc: Fixed typo in doxygen string.Moritz Fischer2014-05-271-1/+1
| |/ /
* | | Merge branch 'maint'Ben Hilburn2014-05-2214-41/+49
|\| |
| * | Further changes to bit-specific types for building on older OSes.Ben Hilburn2014-05-2214-41/+49
| |\ \ | | |/ | |/|
| | * Lots of bit-specific type work to fix compilation on older OSes.Ben Hilburn2014-05-2114-41/+49
| |/
* | Merge branch 'maint'Ben Hilburn2014-05-203-8/+11
|\|
| * x300: adding include to fix builds on older systemsBen Hilburn2014-05-201-0/+1
| * Fixing Bug #473 - Autoselection of VCO Frequency in DBSRX2Ben Hilburn2014-05-201-6/+8
| |\
| | * Fixed whitespace and added comment.michael-west2014-05-201-5/+6
| | * Fix for BUG 473: UHD: DBSRX2 VCO Autoselect Failing / Wrong Frequency Rangemichael-west2014-05-131-3/+4
| * | x300: Fixing Bug 456 - backwards LED colors.Ben Hilburn2014-05-201-2/+2
| |\ \
| | * | Fix for BUG 456: LED TX/RX colors backwards on X300michael-west2014-05-161-2/+2
| | |/
* | | docs: Fixed broken tablesMartin Braun2014-05-152-58/+81
* | | Merging maint. Includes manual changes which break B200 Doxygen pageBen Hilburn2014-05-142-1/+84
|\| |
| * | Merge branch 'origin/mwest/b200_docs' into maintBen Hilburn2014-05-141-0/+74
| |\ \
| | * | Removed debug header, GPSDO ISP switch, and test points.michael-west2014-03-271-39/+0
| | * | Changed all references to Catalina to AD9361michael-west2014-03-261-5/+5
| | * | Merge branch 'master' into mwest/b200_docsmichael-west2014-03-252601-115480/+1571126
| | |\ \
| | | * \ Merge branch 'master' of github.com:EttusResearch/uhddevmichael-west2014-03-2512-3423/+3448
| | | |\ \
| | | * \ \ Merge branch 'master' of github.com:EttusResearch/uhddevmichael-west2014-03-181-1/+2
| | | |\ \ \
| | | | * \ \ Merge branch 'maint'Nicholas Corgan2014-03-181-1/+2
| | | | |\ \ \
| | * | | | | | Addressed comments from review.michael-west2014-03-251-15/+14
| | * | | | | | Merge branch 'master' into mwest/b200_docsMichael West2014-01-172-6/+37
| | |\ \ \ \ \ \
| | * | | | | | | Added hardware reference to B200 documentation.Michael West2014-01-171-0/+114
| * | | | | | | | Merge branch 'origin/uhd/win_package_name' into maintBen Hilburn2014-05-141-1/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | cmake: add option to specify MSVC version in package filenameNicholas Corgan2014-05-071-1/+15
* | | | | | | | | | Merge branch 'maint'Ben Hilburn2014-05-141-0/+5
|\| | | | | | | | |
| * | | | | | | | | BUG #465: UHD: "Error: Connection refused" for USRP1 and B100michael-west2014-05-141-0/+5