projects
/
profile
/
ivi
/
genivi
/
genivi-audio-manager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dda6516
792540e
)
Merge remote branch 'buildsau/master'
author
christian mueller
<christian.ei.mueller@bmw.de>
Thu, 1 Mar 2012 18:22:53 +0000
(19:22 +0100)
committer
christian 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