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

# Conflicts:
#	taglib/ape/apefile.cpp
#	taglib/flac/flacfile.cpp
#	taglib/mpc/mpcfile.cpp
#	taglib/mpeg/mpegfile.cpp
#	taglib/mpeg/mpegfile.h
#	taglib/trueaudio/trueaudiofile.cpp
#	taglib/wavpack/wavpackfile.cpp
This commit is contained in:
Tsuda Kageyu
2015-12-21 14:56:13 +09:00
22 changed files with 666 additions and 560 deletions

View File

@ -243,7 +243,7 @@ check_cxx_source_compiles("
int main() {
_strdup(0);
return 0;
}
}
" HAVE_ISO_STRDUP)
# Determine whether zlib is installed.