summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-06 23:01:37 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-06 23:01:37 (GMT)
commit8d06f4e3922f809a77f1a3c20bba4be8f6982f7b (patch)
tree1ee2bfa7ae10fd97f4018109eeb443f07164de16 /examples
parent775eceeceac1e0607ff3f41d0ef490488297a400 (diff)
parent014b5d404b19ad3d81686ba490eb7dd93efee573 (diff)
downloadQt-8d06f4e3922f809a77f1a3c20bba4be8f6982f7b.zip
Qt-8d06f4e3922f809a77f1a3c20bba4be8f6982f7b.tar.gz
Qt-8d06f4e3922f809a77f1a3c20bba4be8f6982f7b.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'examples')
-rw-r--r--examples/phonon/README2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/phonon/README b/examples/phonon/README
index d0f4462..51213cb 100644
--- a/examples/phonon/README
+++ b/examples/phonon/README
@@ -1,4 +1,4 @@
-Qt usese the Phonon cross-platform multimedia framework to play common
+Qt uses the Phonon cross-platform multimedia framework to play common
multimedia formats.
Applications can be written to take advantage of the native multimedia