diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-26 11:12:59 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-26 11:12:59 (GMT) |
commit | a12ca38e9380b6a8bf49751a59d1076f07936e5d (patch) | |
tree | ee19fe533f3e9957a671a6d2c01288449c2cdba0 | |
parent | 063dfe1e41a610f47fdcbda604205a5858e65ebd (diff) | |
parent | 47a1aa988b6ebe397820a23cae460f7b68004788 (diff) | |
download | Qt-a12ca38e9380b6a8bf49751a59d1076f07936e5d.zip Qt-a12ca38e9380b6a8bf49751a59d1076f07936e5d.tar.gz Qt-a12ca38e9380b6a8bf49751a59d1076f07936e5d.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
-rw-r--r-- | tests/auto/atwrapper/scruffy.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/atwrapper/scruffy.ini b/tests/auto/atwrapper/scruffy.ini index 1a99f89..329f537 100644 --- a/tests/auto/atwrapper/scruffy.ini +++ b/tests/auto/atwrapper/scruffy.ini @@ -1,7 +1,7 @@ [General] framework=data/framework.ini ftpBaseDir=/arthurtest -ftpHost=kramer.troll.no +ftpHost=kramer.nokia.troll.no ftpPass=anonymouspass ftpUser=anonymous output=testresults |