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: ebf5699adf6d
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: d1c96121f842
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 5, 2015

  1. travis.yml: update secret

    jordens committed Feb 5, 2015

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    d2914f3 View commit details
  2. Copy the full SHA
    d1c9612 View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 .travis.yml
  2. +4 −4 README.rst
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ env:
- CC=gcc-4.7
- CXX=g++-4.7
- ARTIQ_NO_HARDWARE=1
- secure: DgApzqX7Hidh+CVYVGDvXXc/a/SsF22t18YDx0KNqRKNQMBdeMEfAWMI1kXnPPxazItV4nljvrwOWaPaTY6wlJvV2r1W90zJsN8UVP8cMt2CudUiKBVRGvmr4Z6zhkifaEfzX9pLoCmHhLVyUjGlXPd0dC8GJVROp11FZm1l+rM=
- secure: "DUk/Ihg8KbbzEgPF0qrHqlxU8e8eET9i/BtzNvFddIGX4HP/P2qz0nk3cVkmjuWhqJXSbC22RdKME9qqPzw6fJwJ6dpJ3OR6dDmSd7rewavq+niwxu52PVa+yK8mL4yf1terM7QQ5tIRf+yUL9qGKrZ2xyvEuRit6d4cFep43Ws="
before_install:
- ./.travis/get-toolchain.sh
- ./.travis/get-xilinx.sh
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.. image:: doc/logo/artiq.png
.. image:: https://travis-ci.org/nist-ionstorage/artiq.svg
:target: https://travis-ci.org/nist-ionstorage/artiq
.. image:: https://coveralls.io/repos/nist-ionstorage/artiq/badge.svg?branch=ci
:target: https://coveralls.io/r/nist-ionstorage/artiq?branch=ci
.. image:: https://travis-ci.org/m-labs/artiq.svg
:target: https://travis-ci.org/m-labs/artiq
.. image:: https://coveralls.io/repos/m-labs/artiq/badge.svg
:target: https://coveralls.io/r/m-labs/artiq

ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a
next-generation control system for quantum information experiments. It is