From ad7ada0b186ad249249d5da1d37b89b66c2cce94 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Thu, 30 Nov 2006 17:00:55 +0000
Subject: [PATCH] Oops committed the wrong file. Noticed by todd@

---
 etc/mtree/BSD.etc-x11.dist | 75 ++++++++++++++++++++++++++++++++++++++
 etc/mtree/BSD.x11-etc.dist | 20 ----------
 2 files changed, 75 insertions(+), 20 deletions(-)
 create mode 100644 etc/mtree/BSD.etc-x11.dist
 delete mode 100644 etc/mtree/BSD.x11-etc.dist

diff --git a/etc/mtree/BSD.etc-x11.dist b/etc/mtree/BSD.etc-x11.dist
new file mode 100644
index 000000000..05d607522
--- /dev/null
+++ b/etc/mtree/BSD.etc-x11.dist
@@ -0,0 +1,75 @@
+#     $OpenBSD: BSD.etc-x11.dist,v 1.1 2006/11/30 17:00:55 matthieu Exp $
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+  appdefaults
+  ..
+  fs
+  ..
+  lbxproxy
+  ..
+  proxymngr
+  ..
+  rstart
+    commands
+      x11r6
+      ..
+    ..
+    contexts
+    ..
+    local
+    ..
+  ..
+  twm
+  ..
+  xdm
+  ..
+  xinit
+  ..
+  xkb
+       compat
+       ..
+       compiled
+       ..
+       geometry
+           digital
+           ..
+           sgi
+           ..
+       ..
+       keycodes
+           digital
+           ..
+           sgi
+           ..
+       ..
+       keymap
+           digital
+           ..
+           sgi
+           ..
+           sun
+           ..
+       ..
+       rules
+       ..
+       semantics
+       ..
+       symbols
+           digital
+           ..
+           fujitsu
+           ..
+           nec
+           ..
+           sony
+           ..
+           sun
+           ..
+       ..
+   ..
+   xserver
+   ..
+   xsm
+   ..
+..
diff --git a/etc/mtree/BSD.x11-etc.dist b/etc/mtree/BSD.x11-etc.dist
deleted file mode 100644
index 97b43d75e..000000000
--- a/etc/mtree/BSD.x11-etc.dist
+++ /dev/null
@@ -1,20 +0,0 @@
-#     $OpenBSD: BSD.x11-etc.dist,v 1.1 2006/11/29 21:50:18 matthieu Exp $
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-  appdefaults
-  ..
-  fs
-  ..
-  rstart
-    contexts
-    ..
-    local
-    ..
-  ..
-  twm
-  ..
-  xdm
-  ..
-  xkb
-..