Commit 3a760b06 authored by Lukáš Lalinský's avatar Lukáš Lalinský
Browse files

Merge branch 'stable' 

Conflicts:
	taglib/riff/aiff/aiffproperties.cpp
	taglib/trueaudio/trueaudioproperties.cpp
	tests/test_wav.cpp
parents dcdf4fd9 110cac84
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment