mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-15 21:43:00 +02:00
Code Issues Releases Wiki Activity
6b3bb259d8
tomahawk/src
History
Jeff Mitchell 6b3bb259d8 Merge branch 'master' into watchforchanges-ng 
There's some ugliness on the music page...

Conflicts:
	src/settingsdialog.cpp
	src/stackedsettingsdialog.ui
2011-06-09 14:07:11 -04:00
..
libtomahawk
Merge branch 'master' into watchforchanges-ng
2011-06-09 14:07:11 -04:00
mac
…
resolvers
* Added basic search widget.
2011-06-04 20:47:45 +02:00
sip
Merge pull request from euroelessar/master
2011-06-05 06:33:10 -07:00
sourcetree
…
web
…
xmppbot
…
audiocontrols.cpp
…
audiocontrols.h
…
audiocontrols.ui
…
CMakeLists.linux.txt
…
CMakeLists.osx.txt
…
CMakeLists.txt
remove old settings dialog.ui, just caused confusion
2011-06-07 16:59:19 -04:00
CMakeLists.unix.txt
…
CMakeLists.win32.txt
…
config.h.in
…
configdelegatebase.cpp
…
configdelegatebase.h
…
CPack.txt
…
delegateconfigwrapper.h
attempt strange fix
2011-06-04 20:07:12 -04:00
diagnosticsdialog.cpp
…
diagnosticsdialog.h
…
diagnosticsdialog.ui
…
headlesscheck.h
…
main.cpp
…
musicscanner.cpp
…
musicscanner.h
…
PipelineStatusView.cpp
* Added Pipeline status view. WIP.
2011-06-01 04:21:35 +02:00
PipelineStatusView.h
* Added Pipeline status view. WIP.
2011-06-01 04:21:35 +02:00
proxydialog.ui
…
resolverconfigdelegate.cpp
…
resolverconfigdelegate.h
…
resolversmodel.cpp
…
resolversmodel.h
…
scanmanager.cpp
…
scanmanager.h
…
scrobbler.cpp
…
scrobbler.h
…
searchbox.ui
rename SearchWidget to GlobalSearchWidget
2011-06-04 17:11:22 -04:00
settingsdialog.cpp
Merge branch 'master' into watchforchanges-ng
2011-06-09 14:07:11 -04:00
settingsdialog.h
Merge branch 'master' into watchforchanges-ng
2011-06-09 14:07:11 -04:00
shortcuthandler.cpp
…
shortcuthandler.h
…
sipconfigdelegate.cpp
…
sipconfigdelegate.h
…
stackedsettingsdialog.ui
Merge branch 'master' into watchforchanges-ng
2011-06-09 14:07:11 -04:00
tomahawkapp.cpp
…
tomahawkapp.h
…
tomahawktrayicon.cpp
…
tomahawktrayicon.h
…
tomahawkwindow.cpp
Merge branch 'master' into watchforchanges-ng
2011-06-09 14:07:11 -04:00
tomahawkwindow.h
Merge branch 'master' into watchforchanges-ng
2011-06-09 14:07:11 -04:00
tomahawkwindow.ui
…
transferview.cpp
…
transferview.h
…