diff options
author | Martin Smith <msmith@trolltech.com> | 2010-04-13 08:20:16 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-04-13 08:20:16 (GMT) |
commit | add41080b9a4e2319007063bd73447f336933e9e (patch) | |
tree | 2b5bcbf18d4a0b3dc96043a430830c8212e85749 /tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt | |
parent | 1055099e331af3b10d0b81b1a965e7d3db5f272d (diff) | |
parent | fbacd0fb2eb41470b090a3cbca7535f78689a382 (diff) | |
download | Qt-add41080b9a4e2319007063bd73447f336933e9e.zip Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.gz Qt-add41080b9a4e2319007063bd73447f336933e9e.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt')
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt deleted file mode 100644 index 50518cc..0000000 --- a/tests/auto/declarative/qdeclarativelanguage/data/script.1.errors.txt +++ /dev/null @@ -1 +0,0 @@ -3:1:Invalid use of Script block |