blob: 7a9afb4cb0255a4a5b990b98f1d254a60cb4f315 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
drwxr-xr-x root/root etc/
drwxr-xr-x root/root etc/X11/
drwxr-xr-x root/root etc/X11/xorg.conf.d/
-rw-r--r-- root/root etc/X11/xorg.conf.d/30-nvidia.conf
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/nvidia-settings
-rwxr-xr-x root/root usr/bin/nvidia-xconfig
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/X11/
drwxr-xr-x root/root usr/lib/X11/modules/
drwxr-xr-x root/root usr/lib/X11/modules/drivers/
-rwxr-xr-x root/root usr/lib/X11/modules/drivers/nvidia_drv.so
drwxr-xr-x root/root usr/lib/X11/modules/extensions/
<<<<<<< HEAD
lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.so.304.30
-rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.30
-rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.30
-rwxr-xr-x root/root usr/lib/libGL.so.304.30
-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0
-rw-r--r-- root/root usr/lib/libXvMCNVIDIA.a
-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.30
-rwxr-xr-x root/root usr/lib/libcuda.so.304.30
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.30
-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.30
-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.30
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.30
-rwxr-xr-x root/root usr/lib/libvdpau.so.304.30
drwxr-xr-x root/root usr/lib/tls/
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.30
drwxr-xr-x root/root usr/lib/vdpau/
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.30
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.30
=======
lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.so.304.32
-rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.304.32
-rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.304.32
-rwxr-xr-x root/root usr/lib/libGL.so.304.32
-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0
-rw-r--r-- root/root usr/lib/libXvMCNVIDIA.a
-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.304.32
-rwxr-xr-x root/root usr/lib/libcuda.so.304.32
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.304.32
-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.304.32
-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.304.32
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.304.32
-rwxr-xr-x root/root usr/lib/libvdpau.so.304.32
drwxr-xr-x root/root usr/lib/tls/
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.304.32
drwxr-xr-x root/root usr/lib/vdpau/
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.304.32
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.304.32
>>>>>>> 51a7d4f... nvidia-utils 304.32-1
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/nvidia-settings.1.gz
-rw-r--r-- root/root usr/share/man/man1/nvidia-xconfig.1.gz
|
