Merge remote-tracking branch 'origin/development' into 19-NewStylePhenopowerlaw

This commit is contained in:
Martin Diehl 2018-10-14 15:53:50 +02:00
commit a311cc7673
3 changed files with 3 additions and 2 deletions

@ -1 +1 @@
Subproject commit 70f135395370b06c424e0dcf163afbd9d8ad24a1
Subproject commit 032ae29de57cc7cc52d429e574b9392e48cc9fcd

View File

@ -1 +1 @@
v2.0.2-756-g7217cdac
v2.0.2-813-g2beeb9da

1
src/DAMASK_marc2018.f90 Symbolic link
View File

@ -0,0 +1 @@
DAMASK_marc.f90