aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-01-20 10:12:05 +0100
committerEike Ziller <eike.ziller@qt.io>2020-01-20 10:12:05 +0100
commitc1edecac5ceed7a87963974f8a884af355ab566a (patch)
tree7e1483381a508019808bc4b4a356eec5fc04be0a
parent9b2d1a8c7440d60226d9bef1c2b05b23f172256f (diff)
parentcddc165c37c51dfaf2f7a504e4cd934f541bebe8 (diff)
Merge remote-tracking branch 'origin/4.11'v4.12.0-rc1v4.12.0-beta2v4.12.0-beta1v4.12.0
-rw-r--r--.gitattributes3
-rw-r--r--.tag1
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
diff --git a/.tag b/.tag
new file mode 100644
index 0000000..6828f88
--- /dev/null
+++ b/.tag
@@ -0,0 +1 @@
+$Format:%H$