diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
tree | 4cfa3561f188a3904496cef330c79c1a687436ed /.gitignore | |
parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e0af30c299..da9552c8e6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,12 +4,17 @@ config.tests/*/*/* !config.tests/*/*/*[.]* config.tests/*/*/*[.]app +config.log callgrind.out.* pcviewer.cfg *~ *.a *.la +*_wrapper.sh +*_wrapper.bat +wrapper.sh +wrapper.bat *.core *.moc *.o |