Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.
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: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6acf808a65dc
Choose a base ref
...
head repository: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22e90780008a
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 22, 2020

  1. Copy the full SHA
    afe8b46 View commit details
  2. Copy the full SHA
    c336400 View commit details
  3. Merge pull request #19 from 9names/doc_fixes

    Doc fixes
    azonenberg authored Jun 22, 2020
    Copy the full SHA
    22e9078 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 README.md
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ CMake build wrapper for scopehal and scopehal-apps
### Linux
Install dependencies on ubuntu with
```
sudo apt-get install build-essential cmake pkg-config libglm-dev libgtkmm-3.0-dev libsigc++-2.0-dev libyaml-cpp-dev liblxi-dev texlive texlive-fonts-extra
sudo apt-get install build-essential cmake pkg-config libglm-dev libgtkmm-3.0-dev libsigc++-2.0-dev libyaml-cpp-dev liblxi-dev texlive texlive-fonts-extra libglew-dev
```

Install FFTS library
@@ -17,7 +17,7 @@ git clone https://github.com/anthonix/ffts.git
cd ffts
mkdir build
cd build
cmake ../
cmake ..
make
sudo make install
```
@@ -28,7 +28,7 @@ git clone https://github.com/azonenberg/scopehal-cmake.git --recurse-submodules
cd scopehal-cmake
mkdir build
cd build
cmake ../
cmake ..
make
```