pull in the recent unconditionals merge from master

This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions

1
.gitattributes vendored
View File

@@ -1,4 +1,5 @@
*.[ch] filter=NHtext merge=NHsubst
*.sh filter=NHtext merge=NHsubst
* text=auto
*.hqx -text
*.sln -text