1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-31 19:45:31 +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
..
2009-12-24 19:16:07 +00:00
2010-07-12 19:51:23 +00:00
2010-06-02 17:50:53 +00:00
2010-06-02 17:50:53 +00:00
2010-06-02 17:50:53 +00:00
2010-06-02 17:50:53 +00:00
2010-06-02 18:44:53 +00:00
2011-06-22 23:25:08 +00:00
2010-03-25 19:30:10 +00:00
2010-03-25 19:30:10 +00:00
2009-12-26 17:19:14 +00:00
2012-05-30 02:05:12 -07:00