summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-06-07 13:27:41 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-06-07 13:27:41 (GMT)
commit1c79d97f8130a0c00f4c57535d85bdb4246eeb4d (patch)
tree3842506134728d52e9b0340d2fdd50b2d7e0cace /.gitignore
parent2b4d2fd1ada524f4780dd7633ca34bc72d823ff1 (diff)
parenteba8e2c10c5bc1b373fdf7640962029cb2e7908f (diff)
downloadQt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.zip
Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.gz
Qt-1c79d97f8130a0c00f4c57535d85bdb4246eeb4d.tar.bz2
Merge commit 'refs/merge-requests/2408' of git://gitorious.org/qt/qt into integration
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4e3b130..f398365 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ examples/*/*/*
!examples/*/*/README
examples/*/*/*[.]app
!examples/declarative/*
+!examples/ja_JP/*/*
demos/*/*
!demos/spectrum/*
demos/spectrum/bin