diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-03-10 13:43:22 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-03-10 13:43:22 (GMT) |
| commit | 306d16002220b99ad386fb1255034b94861a8c9f (patch) | |
| tree | 1da1a91756e396e134173caeb4772f3f466033a4 /.gitignore | |
| parent | f82f128451ef78e968c85944af10e0e54dbb73c5 (diff) | |
| parent | 5c36cc0ba648d5efa7592e86d49b23086cdbb8ff (diff) | |
| download | Qt-306d16002220b99ad386fb1255034b94861a8c9f.zip Qt-306d16002220b99ad386fb1255034b94861a8c9f.tar.gz Qt-306d16002220b99ad386fb1255034b94861a8c9f.tar.bz2 | |
Merge branch 'master-upstream'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -249,3 +249,13 @@ src/network/lib src/xml/lib/ .pc/ + +# INTEGRITY generated files +*.gpj +*.int +*.ael +*.dla +*.dnm +*.dep +*.map +work |