From d88a511da345d25cbb905add9ceb258ecc9cf2ba Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 20 Apr 2017 15:35:39 -0400 Subject: kwsys: match upstream changes This allows the import to merge cleanly. --- Source/kwsys/.gitattributes | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/kwsys/.gitattributes b/Source/kwsys/.gitattributes index 9e9c535..7065eb5 100644 --- a/Source/kwsys/.gitattributes +++ b/Source/kwsys/.gitattributes @@ -1,12 +1,12 @@ .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 -- cgit v0.12