diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /.gitignore | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
download | qtbase-6630937e63ae5797487b86743a7733c8ae5cc42c.tar.gz |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index ced19ab58e..596812c715 100644 --- a/.gitignore +++ b/.gitignore @@ -101,7 +101,6 @@ qt*-config.pri /bin/qhelpgenerator /bin/qlalr /bin/qml -/bin/qml1plugindump /bin/qmleasing /bin/qmlimportscanner /bin/qmljs |