diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2017-04-20 19:35:39 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2017-04-20 19:35:39 (GMT) |
| commit | d88a511da345d25cbb905add9ceb258ecc9cf2ba (patch) | |
| tree | 71e5cd23813af53eedb9de8d7f03c4d84c4d9d31 /Source/kwsys/.gitattributes | |
| parent | a139b81a52d6bfb33ea660dff2f89fdb8a2e8ace (diff) | |
| download | CMake-d88a511da345d25cbb905add9ceb258ecc9cf2ba.zip CMake-d88a511da345d25cbb905add9ceb258ecc9cf2ba.tar.gz CMake-d88a511da345d25cbb905add9ceb258ecc9cf2ba.tar.bz2 | |
kwsys: match upstream changes
This allows the import to merge cleanly.
Diffstat (limited to 'Source/kwsys/.gitattributes')
| -rw-r--r-- | Source/kwsys/.gitattributes | 14 |
1 files 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 |