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: 6d0ec2f01d5b
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: 3768c87bed57
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 9, 2015

  1. gitignore: add results created during tests

    @sbourdeauducq
    sbourdeauducq committed Oct 9, 2015
    Copy the full SHA
    37e873d View commit details

Commits on Oct 10, 2015

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

    @sbourdeauducq
    sbourdeauducq committed Oct 10, 2015
    Copy the full SHA
    3768c87 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitignore
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -11,4 +11,5 @@ doc/manual/_build
/dist
/*.egg-info
/.coverage
artiq/test/results
examples/master/results