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

@ -19,7 +19,6 @@
* USA *
***************************************************************************/
#include "config.h"
#include <stdlib.h>
#include <fileref.h>
#include <tfile.h>