1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-02-01 20:06:53 +01:00
Alan Briolat 90d2511051 Merge remote-tracking branch 'upstream/master' into subsonic
Conflicts:
	src/CMakeLists.txt
	src/internet/internetmodel.cpp
	src/ui/settingsdialog.cpp
2013-01-09 21:26:32 +00:00
..
2012-03-07 15:31:12 +00:00
2012-11-29 20:48:35 +01: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-08-08 20:32:11 +01:00
2012-11-18 11:20:27 +11:00
2012-08-04 15:21:44 +02:00