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)
Conflicts:
docs/reference/chimara-docs.sgml

1  2 
docs/reference/chimara-sections.txt
libchimara/gi_dispa.c

Simple merge
Simple merge