1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-05-13 11:40:00 +02:00
Leo Franchi b15d3162de Merge branch 'master' into databasegenerator
Conflicts:
	src/libtomahawk/CMakeLists.txt
	src/libtomahawk/globalactionmanager.cpp
2011-08-05 15:38:26 -04:00
..
2011-07-30 16:13:29 -04:00