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

Merge branch 'master' into accounts

Browse Source 
Conflicts:
	src/libtomahawk/AtticaManager.cpp
	src/libtomahawk/AtticaManager.h
	src/libtomahawk/tomahawksettings.cpp
This commit is contained in:
Leo Franchi
2012-03-01 16:58:08 -05:00
parent e677656b74 191ee259d4
commit 934ee4a535
15 changed files with 110 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/AtticaManager.cpp
View File

@@ -389,7 +389,7 @@ AtticaManager::upgradeResolver( const Content& resolver )
emit resolverStateChanged( resolver.id() );
uninstallResolver( resolver );
installResolver( resolver );
installResolver( resolver, false );
}