From: Philip Chimento Date: Wed, 18 Jan 2012 12:59:59 +0000 (+0100) Subject: Merge branch 'new-sound-api' X-Git-Tag: v0.9~47 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=1461483626f28b52f8f9f3cc350f9cb330579285;p=projects%2Fchimara%2Fchimara.git Merge branch 'new-sound-api' Conflicts: docs/reference/chimara-docs.sgml --- 1461483626f28b52f8f9f3cc350f9cb330579285