Tsuda kageyu bb61b43ba0 Merge branch 'master' into merge-master
Conflicts:
	taglib/mp4/mp4tag.cpp
	taglib/toolkit/taglib.h
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tbytevector.h
	taglib/toolkit/tfile.cpp
	taglib/toolkit/tstring.cpp
	taglib/toolkit/tstring.h
	taglib/trueaudio/trueaudiofile.cpp
	taglib/wavpack/wavpackfile.cpp
	taglib/wavpack/wavpackfile.h
2013-04-16 14:16:54 +09:00
..
2013-04-16 05:53:36 +09:00
2013-04-16 05:53:36 +09:00
2013-04-16 05:53:36 +09:00
2011-01-08 11:20:09 +00:00
2011-01-08 11:20:09 +00:00
2013-03-23 13:58:44 +09:00
2013-03-25 06:13:07 +09:00
2012-11-11 14:35:47 +01:00
2012-08-23 20:54:18 +09:00
2013-04-15 05:03:54 +09:00