Merge topic 'kwsys-import-cleanup'

93219c40 Merge branch 'upstream-KWSys' into kwsys-import-cleanup
22729eae KWSys 2017-04-20 (8785f84f)
d88a511d kwsys: match upstream changes
a139b81a update-kwsys: apply changes made in CMake to the import
e832c32c kwsys: remove extra attribute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !728
This commit is contained in:
Brad King
2017-04-21 12:56:03 +00:00
committed by Kitware Robot
2 changed files with 9 additions and 10 deletions

View File

@@ -1,15 +1,13 @@
.git* export-ignore
*.c our-c-style
*.c.in our-c-style
*.cxx our-c-style
*.h our-c-style
*.h.in our-c-style
*.hxx our-c-style
*.hxx.in our-c-style
*.c kwsys-c-style
*.c.in kwsys-c-style
*.cxx kwsys-c-style
*.h kwsys-c-style
*.h.in kwsys-c-style
*.hxx kwsys-c-style
*.hxx.in kwsys-c-style
*.cmake whitespace=tab-in-indent
*.rst whitespace=tab-in-indent conflict-marker-size=79
*.txt whitespace=tab-in-indent
* -format.clang-format