review.tizen.org Git - platform/upstream/pulseaudio.git/commit

author	Seungbae Shin <seungbae.shin@samsung.com>
	Mon, 27 Dec 2021 05:24:16 +0000 (14:24 +0900)
committer	Seungbae Shin <seungbae.shin@samsung.com>
	Thu, 30 Dec 2021 07:33:41 +0000 (07:33 +0000)
commit	df4ebab2a1fc74d3c1e97e7ff80c760617998b64
tree	f9c0e64a682293ea06d9f9994d6a3a853fad3f94	tree \| snapshot
parent	a3162146a7a39c9ad35fe047722414c8bd64770f	commit \| diff

Initial conflict resolving

Change-Id: Ia4f9d69834edafb1f11d0fd8385aed14b3894459

29 files changed:

meson.build		diff \| blob \| history
meson_options.txt		diff \| blob \| history
src/daemon/main.c		diff \| blob \| history
src/meson.build		diff \| blob \| history
src/modules/bluetooth/backend-ofono.c		diff \| blob \| history
src/modules/bluetooth/bluez5-util.c		diff \| blob \| history
src/modules/bluetooth/bluez5-util.h		diff \| blob \| history
src/modules/bluetooth/module-bluetooth-policy.c		diff \| blob \| history
src/modules/bluetooth/module-bluez5-device.c		diff \| blob \| history
src/modules/bluetooth/module-bluez5-discover.c		diff \| blob \| history
src/modules/meson.build		diff \| blob \| history
src/modules/module-card-restore.c		diff \| blob \| history
src/modules/module-loopback.c		diff \| blob \| history
src/modules/module-null-sink.c		diff \| blob \| history
src/modules/module-tunnel-sink-new.c		diff \| blob \| history
src/modules/raop/raop-client.c		diff \| blob \| history
src/pulse/def.h		diff \| blob \| history
src/pulse/introspect.c		diff \| blob \| history
src/pulse/map-file		diff \| blob \| history
src/pulsecore/core.c		diff \| blob \| history
src/pulsecore/core.h		diff \| blob \| history
src/pulsecore/meson.build		diff \| blob \| history
src/pulsecore/mutex-posix.c		diff \| blob \| history
src/pulsecore/native-common.h		diff \| blob \| history
src/pulsecore/play-memblockq.c		diff \| blob \| history
src/pulsecore/protocol-native.c		diff \| blob \| history
src/pulsecore/sink-input.c		diff \| blob \| history
src/pulsecore/sink-input.h		diff \| blob \| history
src/pulsecore/sink.c		diff \| blob \| history

Domain: Multimedia / Audio FW;