diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 22:31:59 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 22:31:59 (GMT) |
commit | 7c5bff438bcad62c79ba4febdd3f07fce396803e (patch) | |
tree | f5245f91df0bca084a9b2ea9711d6c4f82d754f8 /examples | |
parent | ef5850afa68f148ab72d46bf64a8a1be1a70bb3b (diff) | |
parent | 0a4f8a73165da5ec274409dffa1de921421d9bb1 (diff) | |
download | Qt-7c5bff438bcad62c79ba4febdd3f07fce396803e.zip Qt-7c5bff438bcad62c79ba4febdd3f07fce396803e.tar.gz Qt-7c5bff438bcad62c79ba4febdd3f07fce396803e.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'examples')
-rw-r--r-- | examples/widgets/stylesheet/mainwindow.ui | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/stylesheet/mainwindow.ui b/examples/widgets/stylesheet/mainwindow.ui index 740d37b..2b232df 100644 --- a/examples/widgets/stylesheet/mainwindow.ui +++ b/examples/widgets/stylesheet/mainwindow.ui @@ -41,7 +41,7 @@ <string>Please read the LICENSE file before checking</string> </property> <property name="text" > - <string>I &accept the terms and &conditions</string> + <string>I accept the terms and &conditions</string> </property> </widget> </item> |