Merge remote branch 'origin/development' into cmake

This commit is contained in:
zhangc43 2016-05-03 10:39:43 -04:00
commit aaa08eecc1
3 changed files with 179 additions and 179 deletions

2
.gitattributes vendored
View File

@ -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

View File

@ -1 +1 @@
v2.0.0-214-g6b57eec
v2.0.0-218-g0c70c67