diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
| commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
| tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /.gitignore | |
| parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
| parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) | |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
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 |