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-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 20393a91f983
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7da600d8972b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 6, 2020

  1. Copy the full SHA
    ad32e8f View commit details
  2. Copy the full SHA
    19327f4 View commit details
  3. Merge pull request #128 from tomverbeure/tektronix

    Add Tektronix oscilloscope.
    azonenberg authored Jul 6, 2020
    Copy the full SHA
    7da600d View commit details
Showing with 0 additions and 6 deletions.
  1. +0 −6 glscopeclient/main.cpp
6 changes: 0 additions & 6 deletions glscopeclient/main.cpp
Original file line number Diff line number Diff line change
@@ -40,12 +40,6 @@

#include "glscopeclient.h"
#include "../scopeprotocols/scopeprotocols.h"
#include "../scopehal/SiglentSCPIOscilloscope.h"
#include "../scopehal/AgilentOscilloscope.h"
#include "../scopehal/LeCroyOscilloscope.h"
#include "../scopehal/RigolOscilloscope.h"
#include "../scopehal/RohdeSchwarzOscilloscope.h"
#include "../scopehal/AntikernelLogicAnalyzer.h"
#include "InstrumentConnectionDialog.h"
#include <libgen.h>
#include <omp.h>