summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-08 08:47:27 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-08 08:47:27 (GMT)
commitf17c21cec25f40991865343c5f9c3e838e13d5d3 (patch)
tree616d8582e9817c96d98bf1a645aee76bd4b21598 /examples
parent0822e845b2678ab626cd5fe9919364188c06a70e (diff)
parent04975e4a594af999600e175f65869f615f5e9740 (diff)
downloadQt-f17c21cec25f40991865343c5f9c3e838e13d5d3.zip
Qt-f17c21cec25f40991865343c5f9c3e838e13d5d3.tar.gz
Qt-f17c21cec25f40991865343c5f9c3e838e13d5d3.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
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