projects
/
profile
/
ivi
/
pulseaudio-panda.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0e23606
)
merge r2081 from trunk
author
Lennart Poettering
<lennart@poettering.net>
Thu, 27 Mar 2008 21:24:48 +0000
(21:24 +0000)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 27 Mar 2008 21:24:48 +0000
(21:24 +0000)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2144
fefdeb5f
-60dc-0310-8127-
8f9354f1896f
src/pulse/context.c
patch
|
blob
|
history
diff --git
a/src/pulse/context.c
b/src/pulse/context.c
index
bc960e2
..
7243a29
100644
(file)
--- a/
src/pulse/context.c
+++ b/
src/pulse/context.c
@@
-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>