Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Sun, 10 Oct 2010 23:56:39 +0000 (01:56 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Sun, 10 Oct 2010 23:56:39 +0000 (01:56 +0200)
commit75152fecdcfef4a5eaad4e2bd914710aafcf1e9a
tree9d555823a17be462b4bc51d8b8fa05a6d3662fd5
parentf4a7f53b3ccf72e336c598286422b18ca960cf57
parent09bf0e548a5542ac594e5d44639cb0aeaecdf661
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Add header guards to audio example headers.