diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:59:01 (GMT) |
commit | f1aeeb025c5042f6684855006f963e2203d9c153 (patch) | |
tree | 430cbdfa0c42e23289f7cd4b5907656810dbe895 /tests/auto/networkdata/README | |
parent | 168524d4f642724fe9063500c0c39ab747f145b6 (diff) | |
parent | 88412920c58286d22aaa1e121b1030298adf86eb (diff) | |
download | Qt-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/README | 1 |
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 |