1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-10-05 01:52:28 +02:00

Merge branch 'master' into specfilescanning

This commit is contained in:
Jeff Mitchell
2012-06-26 08:15:04 -04:00
61 changed files with 457 additions and 162 deletions

View File

@@ -67,7 +67,7 @@
#include "TomahawkSettings.h"
#include "SourceList.h"
#include "TomahawkTrayIcon.h"
#include "ScanManager.h"
#include "libtomahawk/filemetadata/ScanManager.h"
#include "TomahawkApp.h"
#include "LoadXSPFDialog.h"