diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-07 17:58:06 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-07 17:58:06 +0200 |
| commit | 06ef7df062507f301fe7e07852a31087ff028f5b (patch) | |
| tree | bbefbae2ad27cea63c7fbfd5f8d6c3d61c41fb00 /.gitignore | |
| parent | 1c79d97f8130a0c00f4c57535d85bdb4246eeb4d (diff) | |
| parent | bf966d125d5c5fa7719ae9f9110db8742d5a4c85 (diff) | |
| download | qt4-tools-06ef7df062507f301fe7e07852a31087ff028f5b.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index f39836540f..f187b230c9 100644 --- a/.gitignore +++ b/.gitignore @@ -206,7 +206,7 @@ bld.inf *.loc !s60main.rss *.pkg -plugin_commonU.def +plugin_commonu.def *.qtplugin *.sis *.sisx |