summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-12-17 23:46:27 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-12-17 23:46:27 (GMT)
commita60c9a1ff41e5ca1482121ff3f89a112b359b6d4 (patch)
treeebe4f5e941eb3bda28593c2b170101867cb0afe3 /.gitignore
parent412920402f488c2cf6eb81e7582f9b5aa7b06680 (diff)
parentb8a4b365b1105a742369bbaa5dc00e43914089e0 (diff)
downloadQt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.zip
Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.gz
Qt-a60c9a1ff41e5ca1482121ff3f89a112b359b6d4.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: .gitignore tests/benchmarks/benchmarks.pro
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1b29fca..50e6fce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,7 +106,6 @@ tests/auto/qprocess/fileWriterProcess.txt
.com.apple.timemachine.supported
tests/auto/qlibrary/libmylib.so*
tests/auto/qresourceengine/runtime_resource.rcc
-tools/qdoc3/qdoc3*
tools/qtestlib/chart/chart*
tools/qtestlib/updater/updater*
tools/activeqt/testcon/testcon.tlb