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: 1cfca74fcb53
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: 6ee86d994f9d
Choose a head ref
  • 5 commits
  • 26 files changed
  • 1 contributor

Commits on Feb 2, 2016

  1. test/ctlmgr: use sys.executable, use default localhost binding

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    ca8a075 View commit details

  2. assume 'import artiq' works before running tests

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    9ca8b48 View commit details

  3. style

    @sbourdeauducq
    sbourdeauducq committed Feb 2, 2016
    Copy the full SHA
    89f68f3 View commit details

Commits on Feb 14, 2016

  1. Merge branch 'newtesting'

    @sbourdeauducq
    sbourdeauducq committed Feb 14, 2016
    Copy the full SHA
    b97be9c View commit details

  2. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Feb 14, 2016
    Copy the full SHA
    6ee86d9 View commit details
Loading