Commit cf0ad967 authored by Tim Beaulen's avatar Tim Beaulen

Solve conflict between JuK and TagLib.

Thanks Matthias for the tip.


svn path=/trunk/KDE/kdemultimedia/juk/; revision=627822
parent 43a8e0cd
......@@ -18,7 +18,8 @@
#include <QRegExp>
#include <QFile>
#include <tag.h>
#include "tag.h"
#include <taglib/tag.h>
#include <mpegfile.h>
#include <vorbisfile.h>
#include <flacfile.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment