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: 4c015d383d28
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: dda5c167b893
Choose a head ref
  • 6 commits
  • 7 files changed
  • 1 contributor

Commits on Feb 18, 2015

  1. benchmarks: add copies of ddb/pdb

    @sbourdeauducq
    sbourdeauducq committed Feb 18, 2015
    Copy the full SHA
    e6d0fc2 View commit details

  2. Revert "tools/file_import: use python 3.4 importlib API" 

    This reverts commit 614a96a.

Conflicts:
	artiq/tools.py
    @sbourdeauducq
    sbourdeauducq committed Feb 18, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    3543dc3 View commit details

  3. tools: add missing import

    @sbourdeauducq
    sbourdeauducq committed Feb 18, 2015
    Copy the full SHA
    d484b3a View commit details

  4. py2llvm: support conversion of fractions to float

    @sbourdeauducq
    sbourdeauducq committed Feb 18, 2015
    Copy the full SHA
    ec84726 View commit details

  5. coredevice: add get_rtio_time

    @sbourdeauducq
    sbourdeauducq committed Feb 18, 2015
    Copy the full SHA
    e10390d View commit details

  6. benchmarks: add rpc_timing

    @sbourdeauducq
    sbourdeauducq committed Feb 18, 2015
    Copy the full SHA
    dda5c16 View commit details
Loading