1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-29 12:12:31 +01:00
Leo Franchi f4c92793e6 Merge branch 'master' into accounts
Conflicts:
	src/libtomahawk/utils/xspfloader.cpp
	src/libtomahawk/utils/xspfloader.h
	src/tomahawkapp.cpp
	src/tomahawkwindow.h
2012-02-27 08:37:40 -05:00
..
2011-10-27 17:24:53 -04:00
2011-08-18 23:25:39 +02:00
2011-08-18 23:25:39 +02:00
2011-08-10 16:20:50 -04:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2011-10-29 09:39:05 -04:00
2011-10-27 08:43:04 -04:00
2011-10-29 09:39:05 -04:00
2011-10-29 09:39:05 -04:00
2011-04-17 11:51:58 -04:00
2011-08-14 15:01:34 -04:00
2011-10-29 09:39:05 -04:00
2011-10-27 17:24:53 -04:00
2011-10-27 17:24:53 -04:00
2011-10-27 17:24:53 -04:00
2011-10-27 17:24:53 -04:00
2011-10-27 17:24:53 -04:00
2011-10-29 09:39:05 -04:00
2011-10-29 09:39:05 -04:00
2011-08-01 03:15:49 +02:00
2011-12-14 09:33:32 -05:00
2011-10-27 17:24:53 -04:00
2010-10-17 05:32:01 +02:00
2011-10-29 09:39:05 -04:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2011-11-01 13:53:17 -04:00
2011-10-27 17:24:53 -04:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2011-08-18 23:25:39 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2011-10-24 14:15:09 -04:00
2011-10-29 09:39:05 -04:00
2011-08-18 23:25:39 +02:00
2011-08-18 23:25:39 +02:00
2011-08-18 23:25:39 +02:00
2011-10-29 09:39:05 -04:00
2011-10-29 09:39:05 -04:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00
2010-10-17 05:32:01 +02:00