Merge branch 'development'

This commit is contained in:
Test User 2016-05-02 09:09:02 +02:00
commit 455c3e5f44
2 changed files with 2 additions and 1 deletions

1
.gitattributes vendored
View File

@ -7,3 +7,4 @@
*.png binary *.png binary
*.jpg binary *.jpg binary
*.cae binary *.cae binary
installation/mods_Abaqus/abaqus_v6_windows.env -crlf

View File

@ -1 +1 @@
v2.0.0-205-gced4d9d v2.0.0-214-g6b57eec