mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-17 07:02:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into taglib2

Browse Source 
Conflicts:
	taglib/mp4/mp4tag.cpp
	taglib/mp4/mp4tag.h
	taglib/toolkit/tfile.cpp
This commit is contained in:
Lukáš Lalinský
2012-11-23 10:17:16 +01:00
parent f2b56a5511 812f63502b
commit db892c43e7
22 changed files with 695 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
taglib/ape/apefile.h
View File

@ -132,6 +132,7 @@ namespace TagLib {
* has no tag at all, APE will be created.
*/
PropertyMap setProperties(const PropertyMap &);
/*!
* Returns the APE::Properties for this file. If no audio properties
* were read then this will return a null pointer.