mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-09-04 03:25:39 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into specfilescanning

Browse Source
This commit is contained in:
Jeff Mitchell
2012-06-26 08:15:04 -04:00
parent 18be2f5f7e 31fda52bcf
commit 09f84fe9e6
61 changed files with 457 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/TomahawkApp.cpp
View File

@@ -50,11 +50,10 @@
#include "web/Api_v1.h"
#include "SourceList.h"
#include "ShortcutHandler.h"
#include "ScanManager.h"
#include "libtomahawk/filemetadata/ScanManager.h"
#include "TomahawkSettings.h"
#include "GlobalActionManager.h"
#include "database/LocalCollection.h"
#include "MusicScanner.h"
#include "Pipeline.h"
#include "DropJob.h"
#include "EchonestCatalogSynchronizer.h"