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

Browse Source

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

...

This commit is contained in:

Tsuda Kageyu

2013-11-16 09:38:38 +09:00

parent 637a08b8b0 f733077917

commit 753c63e0e6

29 changed files with 290 additions and 88 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

ConfigureChecks.cmake Executable file → Normal file