merge r2081 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2144 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 21:24:48 +00:00
parent 0e23606cf9
commit cefa0eb9d9

View file

@ -50,12 +50,12 @@
#include <netdb.h>
#endif
#include "../pulsecore/winsock.h"
#include <pulsecore/core-error.h>
#include <pulse/version.h>
#include <pulse/xmalloc.h>
#include <pulsecore/winsock.h>
#include <pulsecore/core-error.h>
#include <pulsecore/native-common.h>
#include <pulsecore/pdispatch.h>
#include <pulsecore/pstream.h>