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

3
dat/.gitattributes vendored Normal file
View File

@@ -0,0 +1,3 @@
*.def filter=NHtext merge=NHsubst
*.des filter=NHtext merge=NHsubst
*.txt filter=NHtext merge=NHsubst