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

Browse Source

# Conflicts:
#	config.h.cmake
#	taglib/ogg/xiphcomment.cpp
#	taglib/taglib_config.h.cmake
#	taglib/toolkit/tbytevector.cpp
#	taglib/toolkit/trefcounter.cpp
#	taglib/toolkit/tstring.cpp
#	taglib/toolkit/tutils.h
#	taglib/toolkit/tzlib.cpp
#	taglib/xm/xmfile.cpp
#	tests/test_string.cpp
#	tests/test_xiphcomment.cpp

...

This commit is contained in:

Tsuda Kageyu

2016-12-13 13:52:35 +09:00

parent eea1a1b200 a19a623d4b

commit d8114059ee

29 changed files with 397 additions and 286 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/lowercase-fields.ogg Normal file

Binary file not shown.