Tsuda Kageyu ed0305bd3f Merge branch 'master' into merge-master-to-taglib2 ...

# Conflicts:
#	taglib/ape/apefile.cpp
#	taglib/flac/flacfile.cpp
#	taglib/mpc/mpcfile.cpp
#	taglib/mpeg/mpegfile.cpp
#	taglib/mpeg/mpegfile.h
#	taglib/trueaudio/trueaudiofile.cpp
#	taglib/wavpack/wavpackfile.cpp

2015-12-21 14:56:13 +09:00

..

wavpackfile.cpp

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

2015-12-21 14:56:13 +09:00

wavpackfile.h

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

2015-12-21 14:56:13 +09:00

wavpackproperties.cpp

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

2015-12-03 14:44:17 +09:00

wavpackproperties.h

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

2015-12-03 14:44:17 +09:00