diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 23:20:59 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 23:20:59 +0200 |
| commit | 731bb66abcd50573a1dfd478ae0495421d0d7339 (patch) | |
| tree | a82bee72783db8f9063d857205972e71b1df3994 /.gitignore | |
| parent | 768541fb2e81a426daeffc2f81dcca42ecc43919 (diff) | |
| parent | b9a857b0fdcad47db958df635a5af934a8e90d62 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
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 |