Tsuda Kageyu de04f4eb19 Merge branch 'master' into merge-master
Conflicts:
	ConfigureChecks.cmake
	config.h.cmake
	taglib/CMakeLists.txt
	taglib/toolkit/taglib.h
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tmap.tcc
	taglib/toolkit/tstring.h
2013-05-04 01:38:49 +09:00
..
2011-02-25 19:43:25 +00:00
2013-05-02 13:41:26 +09:00
2012-07-11 14:15:12 +02:00
2013-05-03 11:44:36 +09:00