diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-01-20 10:12:05 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-01-20 10:12:05 +0100 |
commit | c1edecac5ceed7a87963974f8a884af355ab566a (patch) | |
tree | 7e1483381a508019808bc4b4a356eec5fc04be0a | |
parent | 9b2d1a8c7440d60226d9bef1c2b05b23f172256f (diff) | |
parent | cddc165c37c51dfaf2f7a504e4cd934f541bebe8 (diff) |
Merge remote-tracking branch 'origin/4.11'v4.12.0-rc1v4.12.0-beta2v4.12.0-beta1v4.12.0
Change-Id: I174b668b91a6b3b837a7d893f766bf6947dba16f
-rw-r--r-- | .gitattributes | 3 | ||||
-rw-r--r-- | .tag | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6b2abde --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +.tag export-subst +.gitattributes export-ignore +.gitignore export-ignore @@ -0,0 +1 @@ +$Format:%H$ |