From d5d3e25f97fd579300b8be329e41eaf7e88bfc69 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Wed, 8 Mar 2017 17:32:59 +0100
Subject: [PATCH] conda: bump misoc (pcu/ISE fix)

---
 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 9eba57408..f400fe87e 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -15,7 +15,7 @@ requirements:
     - python 3.5.2
     - setuptools
     - migen 0.5.dev py_57+gitd4afdeb
-    - misoc 0.6.dev py_14+git5a60714
+    - misoc 0.6.dev py_15+git6136b97
     - jesd204b 0.2
     - binutils-or1k-linux >=2.27
     - llvm-or1k