Merge branch 'master' into taglib2

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
17 changed files with 190 additions and 176 deletions

View File

@ -1,6 +1,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string>
#include <stdio.h>
#include <config.h>
// so evil :(
#define protected public
#include <id3v2tag.h>

View File

@ -1,4 +1,6 @@
#include "config.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef _WIN32
#include <windows.h>