Merge tag 'upstream/1.1.0' into tizen_base 21/285121/1 accepted/tizen/base/20221216.133722 accepted/tizen/base/20221222.011235
authorSeungbae Shin <seungbae.shin@samsung.com>
Tue, 6 Dec 2022 10:49:21 +0000 (19:49 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Tue, 6 Dec 2022 10:51:50 +0000 (19:51 +0900)
commita1bd7f276d6e8457060109b350f19cafefea9fdb
tree4192ad8611c4f43f6287591165e4e19e45fab455
parent0da634998174fae602c7b9c46470c68090479a2a
parent96ea60627d4e94cb444e2642d4f2c200df3198f5
Merge tag 'upstream/1.1.0' into tizen_base

fix conflicts related to previous Tizen patches

Change-Id: I84a1c324d6bf93e9f122de3f1c478bb62a47504f
Makefile.am
configure.ac
examples/generate.c
packaging/libsndfile.spec
src/aiff.c
src/common.h
src/flac.c
src/ogg_vorbis.c
src/sndfile.c
src/w64.c
src/wav.c