summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-06-07 15:58:06 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-06-07 15:58:06 (GMT)
commit06ef7df062507f301fe7e07852a31087ff028f5b (patch)
treebbefbae2ad27cea63c7fbfd5f8d6c3d61c41fb00 /.gitignore
parent1c79d97f8130a0c00f4c57535d85bdb4246eeb4d (diff)
parentbf966d125d5c5fa7719ae9f9110db8742d5a4c85 (diff)
downloadQt-06ef7df062507f301fe7e07852a31087ff028f5b.zip
Qt-06ef7df062507f301fe7e07852a31087ff028f5b.tar.gz
Qt-06ef7df062507f301fe7e07852a31087ff028f5b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index f398365..f187b23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -206,7 +206,7 @@ bld.inf
*.loc
!s60main.rss
*.pkg
-plugin_commonU.def
+plugin_commonu.def
*.qtplugin
*.sis
*.sisx