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: f07ac59801a7
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: 6a16c637cca4
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 1, 2020

  1. Graph widget is now in another library, updated include paths

    @azonenberg
    azonenberg committed Jan 1, 2020
    Copy the full SHA
    6a16c63 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 psuclient/MainWindow.cpp
  2. +1 −1 reflowmon/MainWindow.cpp
2 changes: 1 addition & 1 deletion psuclient/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@

#include "psuclient.h"
#include "../scopehal/Instrument.h"
#include "../scopehal/Graph.h"
#include "../graphwidget/Graph.h"
#include "MainWindow.h"

using namespace std;
2 changes: 1 addition & 1 deletion reflowmon/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@

#include "reflowmon.h"
#include "../scopehal/Instrument.h"
#include "../scopehal/Graph.h"
#include "../graphwidget/Graph.h"
#include "MainWindow.h"

using namespace std;