mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 07:08:38 -05:00
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys: KWSys 2016-12-14 (95a7e234)
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user