diff options
author | Eike Ziller <eike.ziller@qt.io> | 2021-08-18 16:46:20 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-18 16:46:20 +0200 |
commit | 658a0a794a0501d4c00faae64de4a77b2a9465ed (patch) | |
tree | 32d3fb9afe6226c2de5bc030f23a96973e15e5ef | |
parent | 3425b38d4418b5c227d4c76bf11dc3abbd793ae3 (diff) | |
parent | 9cf96f7fc24ac2f87cb894cfe8aeaf85f34bca1a (diff) |
Merge remote-tracking branch 'origin/5.0'
Change-Id: I1e435d12660d2da81f7d5a2fd9e5f5c11d74d3b7
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1 +1,3 @@ .stack-work +CMakeLists.txt.user* +/build*/ |