Merge branch 'upstream-KWSys' into update-kwsys

* upstream-KWSys:
  KWSys 2016-12-14 (95a7e234)
This commit is contained in:
Brad King
2016-12-14 11:19:03 -05:00
4 changed files with 53 additions and 29 deletions
+2 -2
View File
@@ -1,7 +1,5 @@
.git* export-ignore
/CONTRIBUTING.rst conflict-marker-size=78
*.c whitespace=tab-in-indent,no-lf-at-eof
*.h whitespace=tab-in-indent,no-lf-at-eof
*.h.in whitespace=tab-in-indent,no-lf-at-eof
@@ -10,3 +8,5 @@
*.hxx.in whitespace=tab-in-indent,no-lf-at-eof
*.txt whitespace=tab-in-indent,no-lf-at-eof
*.cmake whitespace=tab-in-indent,no-lf-at-eof
*.rst whitespace=tab-in-indent conflict-marker-size=79