Merge branch 'master' of qmuc300924:AudioManager
authorFrank Herchet <frank.fh.herchet@bmw.de>
Wed, 29 Feb 2012 13:15:19 +0000 (14:15 +0100)
committerFrank Herchet <frank.fh.herchet@bmw.de>
Wed, 29 Feb 2012 13:15:19 +0000 (14:15 +0100)
commit2d5384afc024850758449c884844654c915efa1b
tree0277ad3651f8b9d457c36a101044220d97b73944
parent9c703b74e66c33a68f7013f21cf198d242475ba1
parentffccf1e2003cea4230413ccfdfd4cd6515484e4f
Merge branch 'master' of qmuc300924:AudioManager