projects / profile / ivi / audiomanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dda6516 792540e)
Merge remote branch 'buildsau/master'
authorchristian mueller <christian.ei.mueller@bmw.de>
Thu, 1 Mar 2012 18:22:53 +0000 (19:22 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Thu, 1 Mar 2012 18:22:53 +0000 (19:22 +0100)
Conflicts:
AudioManagerDaemon/src/CAmDltWrapper.cpp
AudioManagerDaemon/src/main.cpp
include/shared/CAmDltWrapper.h


Trivial merge
Domain: Multimedia / Audio FW;