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

# Conflicts:
#	taglib/flac/flacfile.h
#	taglib/mpeg/mpegheader.cpp
#	taglib/mpeg/mpegproperties.cpp
#	taglib/ogg/oggfile.cpp
#	taglib/ogg/oggpage.cpp
#	taglib/ogg/oggpageheader.cpp
#	tests/test_mpeg.cpp

2016-01-06 10:28:09 +09:00

..

flacfile.cpp

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

2016-01-06 10:28:09 +09:00

flacfile.h

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

2016-01-06 10:28:09 +09:00

flacmetadatablock.cpp

Refactor out some stuff to CMake tests

2013-04-21 22:24:12 +09:00

flacmetadatablock.h

Fix FSF address

2011-01-08 11:20:09 +00:00

flacpicture.cpp

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

2015-12-03 14:44:17 +09:00

flacpicture.h

Removed smart pointers from public headers

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

flacproperties.cpp

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

2015-12-03 14:44:17 +09:00

flacproperties.h

Remove the definition of offset_t.

2015-12-01 22:10:24 +09:00

flacunknownmetadatablock.cpp

Refactor out some stuff to CMake tests

2013-04-21 22:24:12 +09:00

flacunknownmetadatablock.h

Fix FSF address

2011-01-08 11:20:09 +00:00