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:
0108869
5394c6f
)
Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager
author
blacky
<blacky@kiwi.(none)>
Tue, 5 Jul 2011 18:54:29 +0000
(20:54 +0200)
committer
blacky
<blacky@kiwi.(none)>
Tue, 5 Jul 2011 18:54:29 +0000
(20:54 +0200)
Conflicts:
README
Trivial merge
projects / profile / ivi / genivi / genivi-audio-manager.git / commitdiff