Tsuda Kageyu 10e8866fec Merge branch 'master' into merge-master-to-taglib2
# Conflicts:
#	ConfigureChecks.cmake
#	taglib/CMakeLists.txt
#	taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
#	taglib/toolkit/tfilestream.cpp
2017-06-09 11:11:44 +09:00
..
2016-02-06 01:27:36 +09:00
2016-02-06 01:27:36 +09:00
2016-02-06 01:27:36 +09:00