Commit 08849455 authored by Scott Wheeler's avatar Scott Wheeler
Browse files

Merge branch 'master' into taglib2 

Conflicts:
	tests/test_aiff.cpp
	tests/test_flac.cpp
parents 93c2758c 82315276
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