aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | Merge branch 'maint'Ben Hilburn2014-05-1471-4093/+117072
|\| | | | | | | | |
| * | | | | | | | | fpga: updating b200 and x300 FPGA source code for latest imagesBen Hilburn2014-05-1471-4093/+117072
* | | | | | | | | | Merge branch 'maint'Nicholas Corgan2014-05-141-2/+2
|\| | | | | | | | |
| * | | | | | | | | cmake: updated uhd_images_downloader URL/md5sumNicholas Corgan2014-05-141-2/+2
* | | | | | | | | | Merge branch 'maint'Nicholas Corgan2014-05-121-3/+3
|\| | | | | | | | |
| * | | | | | | | | log: replaced usage of deprecated boost::filesystem functionNicholas Corgan2014-05-121-3/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Ben Hilburn2014-05-082-7/+27
|\| | | | | | | |
| * | | | | | | | Merge branch 'origin/martin/multi_usrp/bug_dc_offset' into maintBen Hilburn2014-05-081-5/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | multi_usrp: Throws warnings for some tree propsMartin Braun2014-05-051-5/+25
| * | | | | | | | msg_task: return std::vector<boost::uint8_t> instead of std::vector<uint8_t>Nicholas Corgan2014-05-071-2/+2
* | | | | | | | | usrp_n2xx_simple_net_burner: implement features from old Python burnerNicholas Corgan2014-05-071-31/+85
* | | | | | | | | Merge branch 'maint'michael-west2014-05-061-1/+8
|\| | | | | | | |
| * | | | | | | | Merge branch 'mwest/gpsdo_empty_strings' into maintmichael-west2014-05-061-1/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG #460: X300: GPGGA sensor most often empty, while RMC is usually OKmichael-west2014-05-061-1/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'maint'Nicholas Corgan2014-05-062-4/+17
|\| | | | | | | |
| * | | | | | | | usrp2: fixed usrp2_card_burner.py and usrp_n2xx_simple_net_burner paths in in...Nicholas Corgan2014-05-062-4/+17
| |/ / / / / / /
* | | | | | | | Merge branch 'maint'Nicholas Corgan2014-04-301-2/+2
|\| | | | | | |