diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-30 23:10:49 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-30 23:10:49 +0200 |
| commit | 2699705aa9c07105bc24c722845acbbd5a02c3e4 (patch) | |
| tree | 88edd2ffccd63f56a38acc80b352c8d53ff89c3b | |
| parent | 2bcb6ddc0c891dcdbb1d3c7a931e58f1183fd4ee (diff) | |
| parent | 1a9c2249defaa7c752f5fe6a77ed1f696bc81d3d (diff) | |
| download | qtx11extras-2699705aa9c07105bc24c722845acbbd5a02c3e4.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1a43928ab6b5c1458c1f662896e022b24bf38ee1
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index a96f8f5..1a045fa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ -.tag export-subst -.gitignore export-ignore -.gitattributes export-ignore +.tag export-subst +.gitignore export-ignore +.gitattributes export-ignore +.commit-template export-ignore |