diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst index 37c7f7c20..b48faa796 100644 --- a/RELEASE_NOTES.rst +++ b/RELEASE_NOTES.rst @@ -3,6 +3,14 @@ Release notes ============= +ARTIQ-5 +------- + +5.0 +*** + + + ARTIQ-4 ------- diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 5b87fb011..8212a62c1 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -15,7 +15,7 @@ requirements: - python >=3.5.3,<3.6 - setuptools 33.1.1 - migen 0.8 py35_0+git2d62c0c - - misoc 0.11 py35_34+git714ea689 + - misoc 0.12 py35_0+git714ea689 - jesd204b 0.10 - microscope - binutils-or1k-linux >=2.27