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

Conflicts:
	taglib/mp4/mp4properties.cpp
	taglib/mp4/mp4properties.h
	taglib/mpeg/id3v2/id3v2frame.cpp
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tlist.tcc
	taglib/toolkit/tmap.tcc
	taglib/toolkit/tstring.h
	taglib/wavpack/wavpackproperties.cpp
	tests/test_mp4.cpp

2013-11-16 09:38:38 +09:00

..

wavpackfile.cpp

Merge branch 'master' into taglib2

2013-07-11 10:14:09 +02:00

wavpackfile.h

Merge branch 'master' into taglib2

2013-07-11 10:14:09 +02:00

wavpackproperties.cpp

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

2013-11-16 09:38:38 +09:00

wavpackproperties.h

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

2013-11-16 09:38:38 +09:00