Merge branch 'development'

2016-05-03 16:12:52 +02:00 · 2016-05-03 16:12:52 +02:00 · e90c1b4f06
parent 455c3e5f44 297d5caca0
commit e90c1b4f06
2 changed files with 2 additions and 2 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -3,8 +3,8 @@
 # always use LF, even if the files are edited on windows, they need to be compiled/used on unix
 * text eol=lf

+installation/mods_Abaqus/abaqus_v6_windows.env eol=crlf 
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary
 *.cae binary
-installation/mods_Abaqus/abaqus_v6_windows.env -crlf
--- a/2
+++ b/2
@ -1 +1 @@
-v2.0.0-214-g6b57eec
+v2.0.0-218-g0c70c67