1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-02-01 11:56:45 +01:00
Alan Briolat 92c15f3a5a Merge remote-tracking branch 'upstream/master'
Fixed SubsonicService for new InternetService signature.

Conflicts:
	data/data.qrc
	src/ui/settingsdialog.cpp
	src/ui/settingsdialog.h
2012-07-28 14:10:42 +01:00
..
2012-03-07 15:31:12 +00:00
2011-09-02 00:18:15 +02:00
2012-03-07 12:27:44 +00:00
2010-11-23 17:38:39 +00:00
2012-03-06 18:39:34 +00:00
2012-03-06 18:39:34 +00:00
2012-05-29 18:51:46 -07:00