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: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 95dbafd66296
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 129927490b2e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 21, 2016

  1. MANIFEST.in: update

    @sbourdeauducq
    sbourdeauducq committed Feb 21, 2016
    Copy the full SHA
    1a5ccdf View commit details

  2. conda: pyqt -> pyqt5

    @sbourdeauducq
    sbourdeauducq committed Feb 21, 2016
    Copy the full SHA
    1299274 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 MANIFEST.in
  2. +1 −1 conda/artiq/meta.yaml
2 changes: 1 addition & 1 deletion MANIFEST.in
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
graft artiq/runtime
include artiq/gui/icon.png
include artiq/gui/logo.svg
include versioneer.py
include artiq/_version.py
2 changes: 1 addition & 1 deletion conda/artiq/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ requirements:
- sphinx-argparse
- h5py
- dateutil
- pyqt
- pyqt5
- quamash
- pyqtgraph
- pygit2