Commit f0e8f39d authored by Tsuda Kageyu's avatar Tsuda Kageyu
Browse files

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

Conflicts:
	ConfigureChecks.cmake
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tstring.cpp
	taglib/xm/xmfile.cpp
	tests/test_wav.cpp
parents efcd751a b1a82055
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment