Commit a04d7d0b authored by Mathias Panzenböck's avatar Mathias Panzenböck
Browse files

Merge branch 'master' of https://github.com/taglib/taglib 

Conflicts:
	taglib/CMakeLists.txt
	tests/CMakeLists.txt
parents c7fd4cd2 6b063862
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