diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-26 11:32:55 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-26 11:33:19 +0200 |
| commit | 7810209ba32fcebfa90b081670595daaa5333a78 (patch) | |
| tree | 98410d5cc7d9d762bbde0cb4eae8041aa6e2e542 /.gitignore | |
| parent | 6f2eabb54e3f827ebd2b90f68144b86342933869 (diff) | |
| parent | 88625709058b386ee74cca536c6c5556159c99fa (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I4ea2b77cc201daed94fbe321f146dfd20365a534
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index b9188d84f7..e4079c6b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -56,8 +56,6 @@ qt*-config.pri /src/angle/src/QtANGLE/libANGLE/ /src/angle/src/libGLESv2/libANGLE/ -/src/corelib/global/qfloat16tables.cpp - /examples/*/*/* !/examples/*/*/*[.]* !/examples/*/*/README |