* solved merge conflicts
authorchristian mueller <christian.ei.mueller@bmw.de>
Thu, 1 Mar 2012 18:20:57 +0000 (19:20 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Thu, 1 Mar 2012 18:20:57 +0000 (19:20 +0100)
commitdda6516c5406e08f9e2dec391e075d5f2e075e6d
tree7cf11b7496a7a83478fcd5a097c45d462ddf6da1
parentdfcafbec34e0e454d9995551998af5d40a27c7ad
* solved merge conflicts
.gitignore
AudioManagerDaemon/src/CAmDltWrapper.cpp
AudioManagerDaemon/src/main.cpp
include/shared/CAmDltWrapper.h