diff options
| author | Jonathan Bauer | 2013-06-13 15:33:26 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-13 15:33:26 +0200 |
| commit | dfa3b4b7a6208605c9461b6a857533680a600bb0 (patch) | |
| tree | 0ce448ce43fec114d5d9840c9b5c1a6d682d77af /remote/modules/xorg | |
| parent | [xorg] add pacakge libgl1-mesa-glx needed for libGL.so.1 (diff) | |
| parent | [xorg] remove /lib/udev from config (diff) | |
| download | tm-scripts-dfa3b4b7a6208605c9461b6a857533680a600bb0.tar.gz tm-scripts-dfa3b4b7a6208605c9461b6a857533680a600bb0.tar.xz tm-scripts-dfa3b4b7a6208605c9461b6a857533680a600bb0.zip | |
merge
Diffstat (limited to 'remote/modules/xorg')
| -rw-r--r-- | remote/modules/xorg/xorg.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf index 74d162e7..a3e5e6a0 100644 --- a/remote/modules/xorg/xorg.conf +++ b/remote/modules/xorg/xorg.conf @@ -41,8 +41,13 @@ REQUIRED_BINARIES=" Xorg xkbbell xkbevd vmmouse_detect" +<<<<<<< HEAD REQUIRED_DIRECTORIES=" /usr/lib /usr/share/X11 " +======= +REQUIRED_DIRECTORIES=" /usr/lib + /usr/share/X11" +>>>>>>> a39f240dae983bdb9e2ba081483f55e8dfdc2e43 REQUIRED_FILES="" |