projects / platform / core / api / sound-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4943374 059fa19)
Merge branch 'tizen_3.0' into tizen 85/106785/1 accepted/tizen/common/20161227.192039 accepted/tizen/ivi/20161226.012634 accepted/tizen/mobile/20161226.012550 accepted/tizen/tv/20161226.012607 accepted/tizen/wearable/20161226.012616 submit/tizen/20161223.120533
authorSeungbae Shin <seungbae.shin@samsung.com>
Fri, 23 Dec 2016 05:09:18 +0000 (14:09 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Fri, 23 Dec 2016 05:09:18 +0000 (14:09 +0900)
Conflicts:
packaging/capi-media-sound-manager.spec
src/sound_manager.c

Change-Id: I99c412a457f1ce2f5c2d15bce5bd43e2e1ef0057


Trivial merge
Domain: Multimedia / Audio FW;