Merge branch 'orientationClass_with_negative_P' of magit1.mpie.de:damask/DAMASK into orientationClass_with_negative_P

2018-12-08 11:55:19 -05:00 · 2018-12-08 11:55:19 -05:00 · 3d9d70e829
parent b777253dd6 0b99c92fb5
commit 3d9d70e829
3 changed files with 8 additions and 8 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -364,12 +364,12 @@ Phenopowerlaw_singleSlip:
    - master
    - release

-TextureComponents:
-  stage: spectral
-  script: TextureComponents/test.py
-  except:
-    - master
-    - release
+#TextureComponents:
+#  stage: spectral
+#  script: TextureComponents/test.py
+#  except:
+#    - master
+#    - release


 ###################################################################################################
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e9f93abaecafbfbf11072ae70bca213a7201ed38
+Subproject commit 64c39e90200a8dd90dff3665e27050d9db81ac0d
--- a/2
+++ b/2
@ -1 +1 @@
-v2.0.2-1107-g17716b4f
+v2.0.2-1122-g2349341e