summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/audio
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-01-07 14:45:56 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-01-07 14:45:56 (GMT)
commitce5f772c529517c3e1c043fd826a790316ed9915 (patch)
tree159d306fedb648d659ecd6bc90c93225d1d2e6e1 /doc/src/snippets/audio
parenta628b5579a977594cf125110589c8bd5096db380 (diff)
parent55c983e33d974d046d8deab8b68b85efdb9eb03a (diff)
downloadQt-ce5f772c529517c3e1c043fd826a790316ed9915.zip
Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.gz
Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/snippets/audio')
-rw-r--r--doc/src/snippets/audio/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 396872f..019f208 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**