Merge branch '0.6.x'

Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Andrzej Rybczak
2014-11-07 23:13:13 +01:00
3 changed files with 8 additions and 0 deletions

4
NEWS
View File

@@ -9,6 +9,10 @@ ncmpcpp-0.7 (????-??-??)
* List filtering has been removed due to the major part of its functionality overlapping with find forward/backward.
* Find backward/forward function is now incremental.
ncmpcpp-0.6.2 (????-??-??)
* Delete key now aditionally binds by default to action that deletes files in browser.
ncmpcpp-0.6.1 (2014-11-06)
* Comment tag is now properly written to mp3 files.

View File

@@ -187,6 +187,9 @@
# delete_playlist_items
#
#def_key "delete"
# delete_browser_items
#
#def_key "delete"
# delete_stored_playlist
#
#def_key "right"

View File

@@ -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")))