Tsuda Kageyu
753c63e0e6
Merge branch 'master' into merge-master-to-taglib2
Conflicts:
taglib/mp4/mp4properties.cpp
taglib/mp4/mp4properties.h
taglib/mpeg/id3v2/id3v2frame.cpp
taglib/toolkit/tbytevector.cpp
taglib/toolkit/tlist.tcc
taglib/toolkit/tmap.tcc
taglib/toolkit/tstring.h
taglib/wavpack/wavpackproperties.cpp
tests/test_mp4.cpp
2013-11-16 09:38:38 +09:00
..
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2012-01-14 10:16:54 +01:00
2013-07-13 10:38:52 +09:00
2012-02-25 18:46:19 +01:00
2013-09-07 13:06:24 +09:00
2013-03-23 13:42:46 +09:00
2013-11-16 09:38:38 +09:00
2013-03-23 13:42:46 +09:00
2012-11-11 14:26:10 +01:00
2013-07-13 10:38:52 +09:00
2013-06-07 20:00:13 +09:00
2013-04-16 14:16:54 +09:00
2012-11-11 14:26:10 +01:00
2013-09-13 03:47:03 +09:00
2013-06-20 15:38:08 +02:00
2013-09-17 14:59:19 +09:00
2013-05-06 19:23:57 +09:00
2007-11-10 16:46:04 +00:00
2007-11-10 16:46:04 +00:00
2013-05-21 12:03:43 +02:00
2013-05-06 19:23:57 +09:00
2013-11-16 09:38:38 +09:00
2012-11-11 14:26:10 +01:00
2012-11-11 14:26:10 +01:00
2012-07-11 14:15:12 +02:00
2012-11-11 14:26:10 +01:00
2013-03-23 13:42:46 +09:00
2012-11-11 14:26:10 +01:00
2013-05-06 19:23:57 +09:00
2013-03-23 13:42:46 +09:00
2013-03-23 13:42:46 +09:00
2013-05-06 19:23:57 +09:00
2013-05-23 10:23:33 +09:00
2013-11-16 09:38:38 +09:00
2013-03-23 13:42:46 +09:00
2011-04-11 18:32:40 +02:00
2013-07-13 10:38:52 +09:00
2013-05-06 19:23:57 +09:00
2013-03-23 13:42:46 +09:00
2013-05-06 19:23:57 +09:00
2013-06-20 15:07:25 +02:00