projects / platform / core / multimedia / pulseaudio-modules-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 719b131 f551b33)
Merge branch 'tizen_3.0' into tizen 02/106202/1
authorSeungbae Shin <seungbae.shin@samsung.com>
Wed, 21 Dec 2016 04:01:23 +0000 (13:01 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Wed, 21 Dec 2016 04:03:19 +0000 (13:03 +0900)
Conflicts:
Makefile.am
packaging/pulseaudio-modules-tizen.spec
src/device-manager.c
src/module-tizenaudio-policy.c
src/stream-manager.c
src/tizen-device-def.c
src/tizen-device.c
src/tizen-device.h

Change-Id: I13c4a4e82041c8f70047fed58b73fee215f7af60


Trivial merge
Domain: Multimedia / Audio FW;