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

Merge branch 'stable-0.6'

Browse Source
This commit is contained in:
Dominik Schmidt
2013-01-08 02:49:24 +01:00
parent bd2f8b0f36 8305a44900
commit 195e929c7c
7 changed files with 14 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TomahawkWindow.cpp
View File

@@ -1194,7 +1194,7 @@ TomahawkWindow::showAboutTomahawk()
const QString thanksto( tr( "Thanks to:" ) );
desc = QString( "%1<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"
"%2 Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Syd Lawrence, Michael Zanetti, Harald Sitter, Steve Robertson" )
"%2 Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Syd Lawrence, Michael Zanetti, Harald Sitter, Steve Robertson, Teo Mrnjavac" )
.arg( copyright )
.arg( thanksto );

2
src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h
View File

@@ -78,7 +78,7 @@ public:
: DatabaseCommand( parent ), m_actionOnly( action )
{
setSource( source );
qRegisterMetaType<TrackActions>( "DatabaseCommand_LoadSocialAction::TrackActions" );
qRegisterMetaType<TrackActions>( "DatabaseCommand_LoadSocialActions::TrackActions" );
}
/**