Lukáš Lalinský db892c43e7 Merge branch 'master' into taglib2 ...

Conflicts:
	taglib/mp4/mp4tag.cpp
	taglib/mp4/mp4tag.h
	taglib/toolkit/tfile.cpp

2012-11-23 10:17:16 +01:00

..

CMakeLists.txt

…

framelist.cpp

…

inspect.cpp

…

strip-id3v1.cpp

…

tagreader_c.c

…

tagreader.cpp

…

tagwriter.cpp

…