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-09-07 13:06:24 +09:00
2013-07-13 10:38:52 +09:00
2013-07-28 10:33:25 +02:00
2013-07-13 10:38:52 +09:00
2013-07-13 10:38:52 +09:00
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2013-07-13 10:38:52 +09:00
2013-07-13 10:38:52 +09:00
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2013-07-13 10:38:52 +09:00
2013-11-16 09:38:38 +09:00
2013-05-02 20:41:59 +09:00
2013-05-23 10:23:33 +09:00
2013-05-23 10:23:33 +09:00