diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-08-15 10:07:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-08-15 10:07:51 +0200 |
| commit | d8fd5292f17bd07d390500f5daa10b46d5573a49 (patch) | |
| tree | 24a004a722d7947bd6a354e20a5ad6b651c73073 /.gitignore | |
| parent | e6a50fd44a68ccb61a852c4576817162a465c2ce (diff) | |
| parent | 885f8b53858b5c6158a0c6f2208c24cc042b9f38 (diff) | |
| download | qt-creator-d8fd5292f17bd07d390500f5daa10b46d5573a49.tar.gz | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
src/tools/clangbackend/ipcsource/clangjobrequest.cpp
src/tools/clangbackend/ipcsource/clangjobrequest.h
Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 335868cd0f..47924d6b97 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ phony.c /dist/gdb/qtcreator-*/ /dist/gdb/source/ /dist/gdb/staging/ +/doc/qbs/ /doc/qtcreator/ /doc/qtcreator-dev/ /doc/pluginhowto/html/ |