| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | * | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-06-22 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-06-07 | 1 | -2/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-04-17 | 1 | -16/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-04-03 | 1 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-22 | 1 | -6/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-22 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | uhd: Removed stray ifdefs | Martin Braun | 2017-03-10 | 1 | -2/+0 |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'noc0lour/use_stream_api_stream_cmd' into next | Johnathan Corgan | 2017-03-05 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | gr-uhd: use stream api for issue_stream_cmd | Andrej Rode | 2017-01-30 | 1 | -0/+5 |
| | * | | | | | | | | | | | | | | uhd: fixed missing #ifdef from botched merge fixup | Johnathan Corgan | 2017-03-05 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-05 | 3 | -7/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2017-03-05 | 1 | -40/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-02-26 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / / / / / /
| |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | gr-uhd: disable boost thread interrupts during send() and recv() calls in wor... | Martin Braun | 2016-12-13 | 2 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'maint' | Martin Braun | 2016-12-13 | 2 | -2/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix_thread_interrupt_uhd' of https://github.com/noc0lour/gnurad... | Martin Braun | 2016-12-13 | 2 | -2/+5 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-12-13 | 3 | -4/+20 |
| | |\| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-12-10 | 2 | -28/+28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-11-22 | 1 | -0/+53 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-10-13 | 1 | -3/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | | uhd: Updated minimum version to 3.5.5 and removed deprecated code | Martin Braun | 2016-09-24 | 9 | -267/+19 |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-09-24 | 2 | -11/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-09-19 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-09-15 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | wxgui: removed | Johnathan Corgan | 2016-09-08 | 35 | -8914/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-08-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | | | | | | cmake: nuke cpack from existence | Johnathan Corgan | 2016-08-03 | 10 | -59/+2 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-08-01 | 5 | -71/+150 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-06-28 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-06-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-05-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-05-27 | 7 | -3/+295 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-05-11 | 2 | -0/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-04-27 | 7 | -286/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-04-26 | 7 | -3/+286 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-04-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-03-30 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-03-28 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-02-21 | 1 | -13/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-02-14 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-02-12 | 2 | -9/+24 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-02-05 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-01-27 | 1 | -1/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2016-01-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gr_uhd_issue_stream_cmd_on_start' into next-gruhd-stream-cmd | Martin Braun | 2015-12-29 | 4 | -21/+39 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2015-12-07 | 2 | -0/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2015-10-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2015-10-26 | 2 | -20/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2015-10-17 | 4 | -12/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2015-10-03 | 2 | -284/+174 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
