1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 07:49:42 +01:00
Jeff Mitchell ccb6d82e88 Merge branch 'master' into accounts
Conflicts:
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/sip/SipPlugin.h
2011-11-14 15:41:40 -05:00
..
2011-09-21 16:49:09 -04:00
2011-11-13 15:49:59 -05:00
2011-09-11 18:16:24 -04:00
2011-10-12 20:45:43 -04:00
2011-10-07 18:08:13 -04:00
2011-10-12 10:56:35 -04:00
2011-11-13 18:39:00 +01:00
2011-09-20 14:00:10 -04:00
2011-10-25 15:13:17 +02:00