mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-23 23:44:24 -04: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

5
tests/test_id3v2.cpp
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>

4
tests/utils.h
View File

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