aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2021-08-18 16:46:20 +0200
committerEike Ziller <eike.ziller@qt.io>2021-08-18 16:46:20 +0200
commit658a0a794a0501d4c00faae64de4a77b2a9465ed (patch)
tree32d3fb9afe6226c2de5bc030f23a96973e15e5ef
parent3425b38d4418b5c227d4c76bf11dc3abbd793ae3 (diff)
parent9cf96f7fc24ac2f87cb894cfe8aeaf85f34bca1a (diff)
Merge remote-tracking branch 'origin/5.0'
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8ee1bf9..aa71568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
.stack-work
+CMakeLists.txt.user*
+/build*/