summaryrefslogtreecommitdiffstats
path: root/tests/auto/networkdata/README
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-13 10:59:01 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-13 10:59:01 (GMT)
commitf1aeeb025c5042f6684855006f963e2203d9c153 (patch)
tree430cbdfa0c42e23289f7cd4b5907656810dbe895 /tests/auto/networkdata/README
parent168524d4f642724fe9063500c0c39ab747f145b6 (diff)
parent88412920c58286d22aaa1e121b1030298adf86eb (diff)
downloadQt-f1aeeb025c5042f6684855006f963e2203d9c153.zip
Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.gz
Qt-f1aeeb025c5042f6684855006f963e2203d9c153.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
Diffstat (limited to 'tests/auto/networkdata/README')
-rw-r--r--tests/auto/networkdata/README1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/networkdata/README b/tests/auto/networkdata/README
new file mode 100644
index 0000000..e8748cc
--- /dev/null
+++ b/tests/auto/networkdata/README
@@ -0,0 +1 @@
+This directory contains network test data