Tsuda Kageyu d9df59306f Merge branch 'master' into merge-master-to-taglib2 ...

# Conflicts:
#	AUTHORS
#	ConfigureChecks.cmake
#	taglib/asf/asfutils.h
#	taglib/mp4/mp4atom.cpp
#	taglib/mp4/mp4tag.h
#	taglib/mpeg/id3v2/frames/ownershipframe.cpp
#	taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
#	taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
#	taglib/mpeg/id3v2/id3v2frame.cpp
#	taglib/riff/rifffile.cpp
#	taglib/riff/rifffile.h
#	taglib/toolkit/taglib.h
#	taglib/toolkit/tbytevector.cpp
#	taglib/toolkit/tfilestream.cpp
#	taglib/toolkit/tstring.cpp
#	taglib/toolkit/tutils.h
#	taglib/xm/xmfile.cpp
#	tests/test_bytevector.cpp
#	tests/test_fileref.cpp
#	tests/test_id3v2.cpp
#	tests/test_riff.cpp
#	tests/test_string.cpp

2016-10-30 21:20:23 +09:00

..

data

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

CMakeLists.txt

Merge branch 'master' into taglib2

2015-08-10 00:40:22 +09:00

main.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_aiff.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_ape.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_apetag.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_asf.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_bytevector.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_bytevectorlist.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_bytevectorstream.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_dsf.cpp

Implement 'Length in milliseconds' feature of DSF/EBML.

2015-08-10 01:35:57 +09:00

test_file.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_fileref.cpp

Add some missing FileRef tests.

2016-02-06 21:56:51 +09:00

test_flac.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_flacpicture.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_flacunknownmetadatablock.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_id3v1.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_id3v2.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_info.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_it.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_list.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_map.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_matroska.cpp

Implement 'Length in milliseconds' feature of DSF/EBML.

2015-08-10 01:35:57 +09:00

test_mod.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_mp4.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_mp4coverart.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_mp4item.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_mpc.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_mpeg.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_ogg.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_oggflac.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_opus.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_propertymap.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_riff.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_s3m.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_smartptr.cpp

Removed smart pointers from public headers

2013-05-23 10:23:33 +09:00

test_speex.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_string.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_synchdata.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_trueaudio.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_wav.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_wavpack.cpp

Correct the license information.

2016-02-06 01:27:36 +09:00

test_xiphcomment.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

test_xm.cpp

Merge branch 'master' into merge-master-to-taglib2

2016-10-30 21:20:23 +09:00

utils.h

Correct the license information.

2016-02-06 01:27:36 +09:00