Merge branch 'master' into merge-master-to-taglib2

Browse Source

# Conflicts:
#	ConfigureChecks.cmake
#	taglib/CMakeLists.txt
#	taglib/asf/asfattribute.cpp
#	taglib/it/itproperties.cpp
#	taglib/mod/modproperties.cpp
#	taglib/mpeg/mpegfile.cpp
#	taglib/mpeg/mpegproperties.cpp
#	taglib/ogg/flac/oggflacfile.cpp
#	taglib/s3m/s3mproperties.cpp
#	taglib/tagunion.cpp
#	taglib/toolkit/tfile.cpp
#	taglib/toolkit/trefcounter.h
#	taglib/toolkit/tstring.cpp
#	taglib/xm/xmproperties.cpp
#	tests/test_mpeg.cpp

...

This commit is contained in:

Tsuda Kageyu

2017-02-21 10:18:03 +09:00

parent 4328f934c8 45ee18e206

commit bd4a45b07e

70 changed files with 1180 additions and 1052 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

tests/data/empty-seektable.flac Normal file

Binary file not shown.

BIN

tests/data/garbage.mp3 Normal file

Binary file not shown.

0

tests/data/unsupported-extension.xxx → tests/data/unsupported-extension.xx

BIN

tests/data/vbri.mp3

Binary file not shown.