Merge branch 'master' of qmuc300924:AudioManager
authorchristian mueller <christian.ei.mueller@bmw.de>
Fri, 23 Mar 2012 09:17:47 +0000 (10:17 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Fri, 23 Mar 2012 09:17:47 +0000 (10:17 +0100)
commit3c4baa71a0c3176dad0c2dcdafbf802fd28a7200
tree7eb7dc5698d70c448fc841688e9e403b96ac9ed7
parentccf7c1d16046d645eb5c57140ca66dc5c9105bae
parentc36289b87ab67aa1a665002e7054f1a9a58e218f
Merge branch 'master' of qmuc300924:AudioManager