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

Conflicts:
	taglib/ogg/opus/opusproperties.cpp

2014-03-10 11:42:05 +09:00

..

CMakeLists.txt

…

framelist.cpp

…

inspect.cpp

…

strip-id3v1.cpp

…

tagreader_c.c

…

tagreader.cpp

…

tagwriter.cpp

…