Jeff Mitchell 20045b2e14 Merge branch 'master' of github.com:tomahawk-player/tomahawk

2011-05-03 22:13:19 -04:00

..

libtomahawk

fix creating plugin through config dialog signal hookups

2011-05-03 22:12:22 -04:00

mac

…

resolvers

…

sip

fix build

2011-05-03 22:11:23 -04:00

sourcetree

Merge remote-tracking branch 'origin/master'

2011-05-03 16:16:16 -04:00

web

…

xmppbot

…

audiocontrols.cpp

…

audiocontrols.h

…

audiocontrols.ui

…

CMakeLists.linux.txt

…

CMakeLists.osx.txt

…

CMakeLists.txt

Merge remote-tracking branch 'origin/master'

2011-05-03 16:16:16 -04:00

CMakeLists.unix.txt

…

CMakeLists.win32.txt

…

config.h.in

…

configdelegatebase.cpp

fix config rect handling

2011-05-03 18:04:27 -04:00

configdelegatebase.h

fix config rect handling

2011-05-03 18:04:27 -04:00

CPack.txt

…

delegateconfigwrapper.h

…

headlesscheck.h

…

main.cpp

also send args on first startup, not completely working

2011-05-02 22:17:53 -04:00

musicscanner.cpp

…

musicscanner.h

…

proxydialog.ui

…

resolverconfigdelegate.cpp

fix config rect handling

2011-05-03 18:04:27 -04:00

resolverconfigdelegate.h

fix config rect handling

2011-05-03 18:04:27 -04:00

resolversmodel.cpp

…

resolversmodel.h

…

scanmanager.cpp

Properly delete scanner in-thread

2011-05-03 22:13:16 -04:00

scanmanager.h

Properly delete scanner in-thread

2011-05-03 22:13:16 -04:00

scrobbler.cpp

…

scrobbler.h

…

settingsdialog.cpp

Merge remote branch 'origin/master' into leos-crash

2011-05-03 21:58:24 -04:00

settingsdialog.h

disable inline factories and use +/- button for now

2011-05-03 17:49:43 -04:00

settingsdialog.ui

…

shortcuthandler.cpp

…

shortcuthandler.h

…

sipconfigdelegate.cpp

fix config rect handling

2011-05-03 18:04:27 -04:00

sipconfigdelegate.h

fix config rect handling

2011-05-03 18:04:27 -04:00

stackedsettingsdialog.ui

disable inline factories and use +/- button for now

2011-05-03 17:49:43 -04:00

tomahawk.protocol

…

tomahawkapp_macdelegate.h

…

tomahawkapp.cpp

Merge remote branch 'origin/master' into leos-crash

2011-05-03 21:58:24 -04:00

tomahawktrayicon.cpp

…

tomahawktrayicon.h

…

tomahawkwindow.cpp

Merge remote branch 'origin/master' into leos-crash

2011-05-03 21:58:24 -04:00

tomahawkwindow.h

Merge branch 'master' of github.com:tomahawk-player/tomahawk

2011-05-03 15:56:08 -04:00

tomahawkwindow.ui

…

transferview.cpp

…

transferview.h

…