summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudioinput.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-04 06:49:30 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-04 06:49:30 (GMT)
commit53038b678ccba374da5ce9ad216044f075a3ffd8 (patch)
tree743df018a919a08fcff191ed108c68d359d21a1d /src/multimedia/audio/qaudioinput.h
parentda6e8e44ea17da669a173c5cca38ccc77e53dd51 (diff)
parent5cff63b217118e087a6cbd1f27c2a28be83374bb (diff)
downloadQt-53038b678ccba374da5ce9ad216044f075a3ffd8.zip
Qt-53038b678ccba374da5ce9ad216044f075a3ffd8.tar.gz
Qt-53038b678ccba374da5ce9ad216044f075a3ffd8.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Improvements to the QGLShaderProgram API
Diffstat (limited to 'src/multimedia/audio/qaudioinput.h')
0 files changed, 0 insertions, 0 deletions