diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-05 14:01:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-05 14:01:59 +0200 |
| commit | 9989c26bc99c90d3047a7b3e20e0800b62f62300 (patch) | |
| tree | 0a2b04288168bf08530568c94c326f2e9a98a397 /.gitattributes | |
| parent | 39d248fa555350756a569d766f11eec4c65c5b16 (diff) | |
| parent | 3c07ed141c2ed885dea13fbce8603afce6250590 (diff) | |
| download | mariadb-git-9989c26bc99c90d3047a7b3e20e0800b62f62300.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 852eec4d638..9d638481a84 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,6 +25,7 @@ pcre/testdata/greppatN4 -text *.MYD binary *.MYI binary *.class binary +*.jar binary *.c diff=cpp *.h diff=cpp |