mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-22 23:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master

Browse Source 
Conflicts:
	ConfigureChecks.cmake
	config.h.cmake
	taglib/CMakeLists.txt
	taglib/toolkit/taglib.h
	taglib/toolkit/tbytevector.cpp
	taglib/toolkit/tmap.tcc
	taglib/toolkit/tstring.h
This commit is contained in:
Tsuda Kageyu
2013-05-04 01:38:49 +09:00
parent 73e5acdae9 db06166330
commit de04f4eb19
42 changed files with 415 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_fileref.cpp
View File

@ -6,9 +6,6 @@
#include <vorbisfile.h>
#include <cppunit/extensions/HelperMacros.h>
#include "utils.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
using namespace std;
using namespace TagLib;

5
tests/utils.h
View File

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