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/doc/bindings
+++ b/doc/bindings
@@ -187,6 +187,9 @@
 #  delete_playlist_items
 #
 #def_key "delete"
+#  delete_browser_items
+#
+#def_key "delete"
 #  delete_stored_playlist
 #
 #def_key "right"