summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'mergeme/octoclock'Josh Blum2013-06-104-1/+993
|\ \
| * | OctoClock supportNicholas Corgan2013-06-074-1/+993
* | | Merge branch 'mergeme/cbx'Josh Blum2013-06-109-8/+400
|\ \ \
| * | | cbx: added entries into the manualJosh Blum2013-06-103-1/+8
| * | | CBX supportNicholas Corgan2013-06-076-13/+417
* | | | Merge branch 'maint'Nicholas Corgan2013-05-172-1/+139
|\ \ \ \ | | |_|/ | |/| |
| * | | cmake: Copied CMakeParseArguments for backwards compatibilityNicholas Corgan2013-05-172-1/+139
* | | | Merge branch 'maint'Nicholas Corgan2013-05-101-0/+3
|\| | |
| * | | cmake: GCC strips binaries unless build type is specifiedNicholas Corgan2013-05-101-0/+3
* | | | Merge branch 'maint'Nicholas Corgan2013-05-1015-72/+168
|\| | |
| * | | Added CMake variables to customize builds to match Debian package configurationsNicholas Corgan2013-05-1015-73/+168
* | | | Merge branch 'maint'Nicholas Corgan2013-05-101-1/+1
|\| | |
| * | | docs: man pages compress fullyNicholas Corgan2013-05-101-1/+1
* | | | Merge branch 'maint'Nicholas Corgan2013-05-102-3/+3
|\| | |
| * | | Bumped up version to 3.5.3release_003_005_003Nicholas Corgan2013-05-102-3/+3
* | | | Merge branch 'maint'Nicholas Corgan2013-05-102-4/+8
|\| | | | |_|/ |/| |
| * | Merge branch 'fpga_master' into maintJosh Blum2013-05-092-4/+8
| |\ \
| | * | E100: revert unnecessary change to fifo_to_gpmcJosh Blum2013-05-092-4/+8
* | | | Merge branch 'maint'Nicholas Corgan2013-05-0313-9/+687
|\| | |
| * | | UHD has man pages nowNicholas Corgan2013-05-0313-9/+687
* | | | Merge branch 'maint'Nicholas Corgan2013-05-033-23/+55
|\| | |
| * | | Made uhd_images_downloader more robust to match Debian's uhd_firmware_installerNicholas Corgan2013-05-033-23/+55
* | | | Merge branch 'maint'Nicholas Corgan2013-04-302-1/+4
|\| | |
| * | | Minor changes for Debian package complianceNicholas Corgan2013-04-302-1/+4
* | | | Merge branch 'maint'Josh Blum2013-04-241-0/+1
|\| | |
| * | | uhd: added missing include iomanipJosh Blum2013-04-241-0/+1
* | | | cmake: Added custom NSIS templatesNicholas Corgan2013-04-162-0/+992
* | | | orc: fixed orc version check with pkg configJosh Blum2013-04-151-1/+9
* | | | Merge branch 'maint'Josh Blum2013-04-125-34/+79
|\| | |
| * | | uhd: switch the reusable barrier to condition variablesJosh Blum2013-04-123-28/+53
| * | | uhd: fixes for time_spec's to_ticks and from_ticks callsJosh Blum2013-04-122-6/+37
* | | | gps: only enable SERV:TRAC when requestedJosh Blum2013-04-091-2/+11
* | | | gps: flush uart buffer before waiting for timeJosh Blum2013-04-092-2/+4
* | | | Merge branch 'maint'Josh Blum2013-04-091-1/+1
|\| | |
| * | | gps: use to_ticks in query app to avoid rounding issuesJosh Blum2013-04-091-1/+1
* | | | gps: added print for pc clock time to query_gpsdoJosh Blum2013-04-091-0/+2
* | | | Merge branch 'maint'Josh Blum2013-04-021-0/+1
|\| | |
| * | | Merge branch 'fpga_master' into maintJosh Blum2013-04-021-0/+1
| |\| |
| | * | E110: revert Makefile for E110, the UCF was accidentally removedJosh Blum2013-04-021-0/+1
* | | | orc: added std cmake finder script for orcJosh Blum2013-03-292-5/+32
* | | | Merge branch 'maint'Nicholas Corgan2013-03-271-1/+1
|\| | |
| * | | utils: Fixed usrp_n2xx_simple_net_burner warningNicholas Corgan2013-03-271-1/+1
* | | | Merge branch 'maint'Josh Blum2013-03-263-12/+17
|\| | |
| * | | uhd: updated UHD_IMAGES_DOWNLOAD_SRC for 3.5.2release_003_005_002Josh Blum2013-03-261-1/+1
| * | | utils: usrp_n2xx_simple_net_burner now has option to automatically rebootNicholas Corgan2013-03-261-10/+15
| * | | uhd: update version to 3.5.2 for patch releaseJosh Blum2013-03-261-1/+1
* | | | Merge branch 'maint'Nicholas Corgan2013-03-261-1/+1
|\| | |
| * | | Merge branch 'maint34' into maintNicholas Corgan2013-03-261-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | docs: fixed typo in calibration documentationNicholas Corgan2013-03-261-1/+1
* | | | Merge branch 'maint'Josh Blum2013-03-2514-68/+76
|\| | |