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

Browse Source

# Conflicts:
#	taglib/mp4/mp4atom.cpp
#	taglib/toolkit/tutils.h
#	tests/test_apetag.cpp

...

This commit is contained in:

Tsuda Kageyu

2016-11-09 11:05:53 +09:00

parent 13223ad497 499f6db977

commit bd5688ae5f

14 changed files with 190 additions and 59 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/zero-length-mdat.m4a Normal file

Binary file not shown.