summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-19 03:13:15 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-19 03:13:15 (GMT)
commit398d37e78d0026b832e1676de9bd33b5441bfd9e (patch)
tree69cfa40370d5b837ac310a463f898471fa949f3a /.gitignore
parentbfe06c2531fa47d4d417ec22bdb184b06ad0f073 (diff)
parent80cd617b05ad3e647c87dc063d40cde0617344ca (diff)
downloadQt-398d37e78d0026b832e1676de9bd33b5441bfd9e.zip
Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.tar.gz
Qt-398d37e78d0026b832e1676de9bd33b5441bfd9e.tar.bz2
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 57f3417..d0e9c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,6 +204,7 @@ plugin_commonU.def
*.qtplugin
*.sis
*.sisx
+*.lst
# Generated by abldfast.bat from devtools.
.abldsteps.*