Evilly merge branch 'dsound-openal-git' into dsoal
commit39f9eacd2438c00291d32c40f67e01b4447419c1
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 14 Aug 2012 18:26:30 +0000 (14 20:26 +0200)
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 14 Aug 2012 19:16:48 +0000 (14 21:16 +0200)
tree827260b7754e3ef825ce873483031f412296ed31
parent674e9102986db163cf2c9f419b2ccb4255b4aa78
parentf99c41e3f9d5eccba3c3c2d817955809b81f584e
Evilly merge branch 'dsound-openal-git' into dsoal

... BET YOU DIDN'T THINK I COULD DO IT?!
dlls/dsound/Makefile.in
dlls/dsound/alext.h
dlls/dsound/buffer.c
dlls/dsound/dsound8.c
dlls/dsound/dsound_main.c
dlls/dsound/dsound_private.h
dlls/dsound/duplex.c
dlls/dsound/eax.h
dlls/dsound/efx.h
dlls/dsound/primary.c
dlls/dsound/propset.c