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
..
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
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