- merge audio headers

svn path=/branches/audio-bringup/; revision=49511

diff --cc include/ddk/dmusicks.h
Simple merge

diff --cc include/ddk/dmusprop.h
index 0000000,55877e5..55877e5
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/include/ddk/dmusprop.h
+++ b/include/ddk/dmusprop.h

diff --cc include/ddk/portcls.h
Simple merge

diff --cc include/psdk/ks.h
Simple merge

diff --cc include/psdk/ksmedia.h
Simple merge

diff --cc include/reactos/libs/sound/mmebuddy.h
Simple merge