# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1184620593 18000
# Node ID a7e596cf1c3adf678a5504f1d21fec2108fa875a
# Parent  1ddeb9f068abc9d8967410ea9b0d5a2ea7eaeab3# Parent  f33329f754b55b791d5d9a578a6198717cbabacd
auto merge

diff -r 1ddeb9f068ab -r a7e596cf1c3a src/audacious/playback.c