Merge branch 'master' into taglib2

Browse Source

Conflicts:
	taglib/ogg/opus/opusfile.cpp
	taglib/riff/wav/wavfile.cpp
	taglib/toolkit/tstring.h

...

This commit is contained in:

Lukáš Lalinský

2013-07-11 10:14:09 +02:00

parent 45e8e83041 3a636c752b

commit 48191904f1

30 changed files with 449 additions and 103 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

BIN

tests/data/no-extension Normal file

Binary file not shown.

BIN

tests/data/unsupported-extension.xxx Normal file

Binary file not shown.