diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-19 12:06:21 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-19 12:06:21 +1000 |
| commit | fb6775d423f1ebe7e624951edf39d79ca0433d4a (patch) | |
| tree | 4b5b93d3c2d835b268ce16f2fe9a91e4b89ecfde /.gitignore | |
| parent | 9c7c859647771d5d2fa466b0a3ff9d408edecd38 (diff) | |
| parent | f9f08de9d41fd55d9c7d01578191ef5d4099c9e6 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9f4144a988..2fdd27a361 100644 --- a/.gitignore +++ b/.gitignore @@ -96,6 +96,7 @@ tests/auto/qresourceengine/runtime_resource.rcc tools/qdoc3/qdoc3* tools/qtestlib/updater/updater* tools/activeqt/testcon/testcon.tlb +translations/*.qm qrc_*.cpp # xemacs temporary files @@ -173,6 +174,7 @@ doc/qch doc-build .rcc .pch +qtc-debugging-helper src/corelib/lib src/network/lib src/xml/lib/ |