Merge branch '0.6.x'

Conflicts: NEWS configure.ac
2014-11-07 23:13:13 +01:00
parent 6a5f46a458 2ef83ff15f
commit 543dadf3c6
3 changed files with 8 additions and 0 deletions
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -366,6 +366,7 @@ void BindingsConfiguration::generateDefaults()
 	if (notBound(k = stringToKey("delete")))
 	{
 		bind(k, Actions::Type::DeletePlaylistItems);
+		bind(k, Actions::Type::DeleteBrowserItems);
 		bind(k, Actions::Type::DeleteStoredPlaylist);
 	}
 	if (notBound(k = stringToKey("right")))