projects / profile / ivi / audiomanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b65963 bef6b6f)
Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager
authorchristian mueller <christian.ei.mueller@bmw.de>
Tue, 31 Jan 2012 16:51:40 +0000 (17:51 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Tue, 31 Jan 2012 16:51:40 +0000 (17:51 +0100)
Conflicts:
AudioManagerDaemon/test/routing/routingTest.cpp
CHANGELOG
includes/config.h


Trivial merge
Domain: Multimedia / Audio FW;