Looks good. I've merged re-merged your audio-card branch into my fallback-art branch, so it'd be good to check that this branch is still clean.
Since you did a direct merge from trunk here, it'll be a criss-cross merge. Bazaar usually handles that okay, but it is best to check and make sure.
« Back to merge proposal
Looks good. I've merged re-merged your audio-card branch into my fallback-art branch, so it'd be good to check that this branch is still clean.
Since you did a direct merge from trunk here, it'll be a criss-cross merge. Bazaar usually handles that okay, but it is best to check and make sure.