Merge remote-tracking branch 'remotes/origin/upstream' into tizen 47/62747/1
authorSeungbae Shin <seungbae.shin@samsung.com>
Fri, 18 Mar 2016 02:52:57 +0000 (11:52 +0900)
committerSeungbae Shin <seungbae.shin@samsung.com>
Fri, 18 Mar 2016 02:53:13 +0000 (11:53 +0900)
commit42472165db346cbc0a60fa1c55fc5ef9afa68fb7
treec7c34f75a0aac70c5094a6c3b8b5ef3e35b4c9f2
parent490349007ec3c1f2aa04f3a1ba0509fd5234a175
parent2fa3ae6121b2855613b19c8ccf5c3418be5494b6
Merge remote-tracking branch 'remotes/origin/upstream' into tizen

Change-Id: I258d58f7d02f8d0c9da99204a82e283d234406ec
configure.ac
src/file_io.c
src/flac.c