diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-16 09:21:11 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-16 09:21:11 +1000 |
| commit | d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04 (patch) | |
| tree | 5326031090ee5921eaf5c3259153194ddc352afc /.gitignore | |
| parent | 45c13a0064281d0e2b9a10c7dfb0cef7f3b6720f (diff) | |
| parent | 669afa2337ad5791502fe3af2e3de648cb60ea9b (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1ab2e328ee..926de5b858 100644 --- a/.gitignore +++ b/.gitignore @@ -180,6 +180,7 @@ doc/qch doc-build .rcc .pch +.metadata # Symbian build system generated files # --------------------- @@ -205,6 +206,7 @@ plugin_commonU.def .project .cproject .make.cache +*.d qtc-debugging-helper src/corelib/lib |