From 6a7983cf89a239706f0ebacd04e6b7ac8a82620b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20J=C3=B6rdens?= <rj@quartiq.de>
Date: Fri, 8 Jun 2018 14:37:13 +0000
Subject: [PATCH] conda: bump misoc

closes #1039
closes #1040
closes #1022
closes #1058
closes #1044
---
 conda/artiq-dev/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index c4ee160d1..2243461ed 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.7 py35_44+gitca28f4e
-    - misoc 0.11 py35_19+git86c6fcb3
+    - misoc 0.11 py35_20+git2436a68d
     - jesd204b 0.7
     - microscope
     - binutils-or1k-linux >=2.27