Merge branch 'v0.17.x'

Conflicts:
	src/queue_save.c
This commit is contained in:
Max Kellermann
2012-08-25 10:28:33 +02:00
12 changed files with 89 additions and 17 deletions

View File

@@ -56,7 +56,7 @@ main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
queue_init(&queue, 32);
for (unsigned i = 0; i < G_N_ELEMENTS(songs); ++i)
queue_append(&queue, &songs[i]);
queue_append(&queue, &songs[i], 0);
assert(queue_length(&queue) == G_N_ELEMENTS(songs));