Merge branch 'v0.15.x' into v0.16.x

Conflicts:
	NEWS
	configure.ac
	src/listen.c
This commit is contained in:
Max Kellermann
2011-04-12 07:39:01 +02:00
3 changed files with 9 additions and 2 deletions

View File

@@ -464,7 +464,7 @@ handle_currentsong(struct client *client,
G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
{
playlist_print_current(client, &g_playlist);
return PLAYLIST_RESULT_SUCCESS;
return COMMAND_RETURN_OK;
}
static enum command_return