osxaudio: Fix merge conflicts
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 17 Apr 2013 18:24:48 +0000 (20:24 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 17 Apr 2013 18:24:48 +0000 (20:24 +0200)
commit27248393e43ed0db3375e10cb04c7b5cf5705254
tree63bdce7e0b73b670823fe4bec4d9a3e799bbda6f
parent12601adbf08a698b61604fb9d3e7d23d5c834eb4
osxaudio: Fix merge conflicts
sys/osxaudio/gstosxcoreaudiocommon.h