Merge branch 'master' into input-hotplug

2006-08-24 10:59:33 +03:00
parent 33af05d58f 67bd672c88
commit 4adf9af313
30 changed files with 2214 additions and 3707 deletions
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -222,6 +222,9 @@
 /* Support IPv6 for TCP connections */
 #undef IPv6

+/* Support os-specific local connections */
+#undef LOCALCONN
+
 /* Support MIT Misc extension */
 #undef MITMISC