Tsuda Kageyu 829f460c3c Merge branch 'master' into merge-master ...

Conflicts:
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tstring.cpp

2013-09-07 13:06:24 +09:00

..

CMakeLists.txt

…

framelist.cpp

…

inspect.cpp

…

strip-id3v1.cpp

…

tagreader_c.c

…

tagreader.cpp

…

tagwriter.cpp

…