diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 14:31:28 +0100 |
| commit | 425b38ef95f6f4478ffbd4ada0d3046fae2c95e7 (patch) | |
| tree | 0347dd701ace8ab022cf6c86edbb61be9795a668 /.gitignore | |
| parent | 2f2b78321427daa8c7f0702140c297d22b0bf3c8 (diff) | |
| parent | 3b512ae142017f105f297467f74dc28d3cb9030a (diff) | |
Merge "Merge master into api_changes" into refs/staging/api_changes
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a9ee862c97..f4013fd98a 100644 --- a/.gitignore +++ b/.gitignore @@ -172,6 +172,10 @@ src/3rdparty/webkit/WebCore/mocinclude.tmp src/3rdparty/webkit/includes.txt src/3rdparty/webkit/includes2.txt +# generated files in configure.exe bootstrapping +tools/configure/configure.intermediate.manifest +tools/configure/configure_pch.pch + # Symlinks generated by configure tools/qvfb/qvfbhdr.h tools/qvfb/qlock_p.h |