Merge branch 'new-sound-api'
authorPhilip Chimento <philip.chimento@gmail.com>
Wed, 18 Jan 2012 12:59:59 +0000 (13:59 +0100)
committerPhilip Chimento <philip.chimento@gmail.com>
Wed, 18 Jan 2012 12:59:59 +0000 (13:59 +0100)
commit1461483626f28b52f8f9f3cc350f9cb330579285
treebf280b73f07923b9df43e9529d1f59067c068e90
parent28c6b69cb8e971a9959066fe896edcc4ae412935
parent6f7ca2daf591a9cc427e8174daf4a07f3e7728ab
Merge branch 'new-sound-api'

Conflicts:
docs/reference/chimara-docs.sgml
docs/reference/chimara-sections.txt
libchimara/gi_dispa.c