diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 09:51:17 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 09:51:17 +0200 |
| commit | 9a3b975da677e77d63f72f0e6bf0450161b4672d (patch) | |
| tree | 2cdec174526a799e6e294365befc82533500f64b /.gitattributes | |
| parent | ae0c576d461d751703bf86315740226aaa54c62a (diff) | |
| parent | a2bb9d263993783923ba8fc83d5b9ddd36dbe09d (diff) | |
| download | mariadb-git-9a3b975da677e77d63f72f0e6bf0450161b4672d.tar.gz | |
Merge branch '5.5' into bb-5.5-serg
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 0b51237e6d6..5e7e12a4cd2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,6 +17,9 @@ # Denote all files that are truly binary and should not be modified. *.png binary *.jpg binary +*.frm binary +*.MYD binary +*.MYI binary *.c diff=cpp *.h diff=cpp |