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
base: 3108ffeef622
Choose a base ref
...
head repository: m-labs/artiq
compare: e7be00baa811
Choose a head ref
  • 2 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 30, 2015

  1. Remove one RTIO out channel to free up some space for travis builds t… 

    …o succeed
    @fallen @sbourdeauducq
    fallen authored and sbourdeauducq committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    e9092ed View commit details
    Browse the repository at this point in the history

  2. Add support for automatic build and upload of dev conda artiq package… 

    …s to binstar by travis-ci

- SoC+BIOS are also built and integrated in the conda package
- artiq_flash.sh script is embedded to allow flashing ppro board
    @fallen @sbourdeauducq
    fallen authored and sbourdeauducq committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    e7be00b View commit details
    Browse the repository at this point in the history