diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 15:18:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 15:18:37 +0200 |
| commit | 41b864397ab9f999a7b140b12d2117b8492ed066 (patch) | |
| tree | 3b4d20a6fc4ea61fa6b1eabe0e8a955dcec176c6 /.gitignore | |
| parent | 4c4fdca8ee3ee3807dd3d56876cfcc1ea1a8cac8 (diff) | |
| parent | a90adae275cef10dd75b8fc19bc97a7cb59c43dc (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9072902ff4efa3469b044b26ed189ac05bf9ce33
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 84257ad33..b49ed94bc 100644 --- a/.gitignore +++ b/.gitignore @@ -143,7 +143,7 @@ CMakeLists.txt.user CMakeCache.txt CMakeFiles CMakeScripts -Testing +#Testing Conflicts with the testing directory Makefile cmake_install.cmake install_manifest.txt |