Merge remote-tracking branch 'origin/master' into kf5
29fa1522f61f
Actions

Authored by heikobecker on Nov 22 2015, 10:09 PM.

Description

Merge remote-tracking branch 'origin/master' into kf5

Committed

heikobecker

Nov 22 2015, 10:09 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
f510f3133ae0	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Nov 5 2015
504a172a7874	l10n daemon script	SVN_SILENT made messages (after extraction)	Nov 5 2015
1f71b605eb04	schweingruber	Fix mail address for packagers	Sep 11 2015
196e7ddccddc	schweingruber	Fix typo in the mail adresses	Sep 11 2015
789d8c947266	l10n daemon script	SVN_SILENT made messages (after extraction)	Aug 14 2015
fec8817c530c	Omar Plummer/Konrad Zemek	Fix TagLib version check.	Aug 6 2015
61756096b4e6	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 21 2015
595b0feacf22	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 26 2015
4fe5d76a6a59	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 5 2015
bc916b4c2838	Ralf Engels	Fix tracks are 'never played'	Jun 3 2015
0b7492e709d9	Soren Harward	Fix long-standing bug: APG returns empty playlist	Jun 1 2015
e70eb0344e64	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 31 2015
1cd2ffa9de72	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 16 2015
66b0c205ebaa	l10n daemon script	SVN_SILENT made messages (after extraction)	May 16 2015

				Path	Packages
	M			ChangeLog
	M			cmake/modules/FindTaglib.cmake
	M			release_scripts/RELEASE_HOWTO
	M			src/amarok.appdata.xml
	M			src/context/servicetypes/amarok_data_engine.desktop
	M			src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop
	M			src/core-impl/collections/support/CollectionManager.cpp
	M			src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop
	M			src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop
	M			src/importers/amarok/amarok_importer-amarok.desktop
	M			src/importers/banshee/amarok_importer-banshee.desktop
	M			src/importers/clementine/amarok_importer-clementine.desktop
	M			src/importers/fastforward/amarok_importer-fastforward.desktop
	M			src/importers/itunes/amarok_importer-itunes.desktop
	M			src/importers/rhythmbox/amarok_importer-rhythmbox.desktop
	M			src/playlistgenerator/ConstraintSolver.cpp
	M			src/scripting/scripts/librivox_service/script.desktop
	M			src/scripting/scripts/lyrics_lyricwiki/script.desktop
	M			src/scripting/scripts/radio_station_service/script.desktop
	M			src/scripting/scripts/script_console/script.desktop
	M			src/services/ampache/amarok_service_ampache_config.desktop
	M			src/services/jamendo/amarok_service_jamendo.desktop