Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
base: 073dc637d396
Choose a base ref
...
head repository: ngscopeclient/scopehal
compare: fcca2e699934
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 21, 2020

  1. set rx/tx timeout after connect, to avoid it being reset

    @pepijndevos
    pepijndevos committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    a9e2677 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2020

  1. Comply with code style

    @pepijndevos
    pepijndevos committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    3147af7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #182 from pepijndevos/timeout 

    set rx/tx timeout after connect, to avoid it being reset
    @azonenberg
    azonenberg committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    fcca2e6 View commit details
    Browse the repository at this point in the history