diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 13:13:15 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-19 13:13:15 +1000 |
| commit | 398d37e78d0026b832e1676de9bd33b5441bfd9e (patch) | |
| tree | 69cfa40370d5b837ac310a463f898471fa949f3a /.gitignore | |
| parent | bfe06c2531fa47d4d417ec22bdb184b06ad0f073 (diff) | |
| parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) | |
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-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 57f3417ae8..d0e9c5f943 100644 --- a/.gitignore +++ b/.gitignore @@ -204,6 +204,7 @@ plugin_commonU.def *.qtplugin *.sis *.sisx +*.lst # Generated by abldfast.bat from devtools. .abldsteps.* |