mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-16 22:52:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into taglib2

Browse Source 
Conflicts:
	bindings/c/tag_c.cpp
	taglib/fileref.cpp
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tstring.cpp
This commit is contained in:
Lukáš Lalinský
2013-06-20 15:38:08 +02:00
parent 2c770600c4 5051010835
commit 2316a9661a
17 changed files with 190 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
taglib/asf/asfproperties.cpp
View File

@ -23,7 +23,6 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include "taglib_config.h"
#include <tdebug.h>
#include <tstring.h>
#include "asfproperties.h"

1
taglib/asf/asftag.cpp
View File

@ -23,7 +23,6 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
#include "taglib_config.h"
#include <tpropertymap.h>
#include "asftag.h"