CVSROOT: /cvs
Module name: xenocara
Changes by: j...@cvs.openbsd.org 2019/11/26 19:10:22
Log message:
Import libdrm 2.4.100
Status:
Vendor Tag: libdrm
Release Tags: libdrm_2_4_100
U xenocara/lib/libdrm/meson_options.txt
U xenocara/lib/libdrm/libsync.h
U xenocara/lib/libdrm/xf86atomic.h
U xenocara/lib/libdrm/util_math.h
U xenocara/lib/libdrm/util_double_list.h
U xenocara/lib/libdrm/libdrm.pc.in
C xenocara/lib/libdrm/xf86drm.c
U xenocara/lib/libdrm/xf86drmHash.c
U xenocara/lib/libdrm/config.h.in
C xenocara/lib/libdrm/aclocal.m4
C xenocara/lib/libdrm/xf86drmMode.c
U xenocara/lib/libdrm/Makefile.sources
U xenocara/lib/libdrm/xf86drmRandom.c
U xenocara/lib/libdrm/meson.build
U xenocara/lib/libdrm/libdrm_lists.h
C xenocara/lib/libdrm/configure.ac
U xenocara/lib/libdrm/xf86drmSL.c
U xenocara/lib/libdrm/xf86drmMode.h
U xenocara/lib/libdrm/Makefile.am
C xenocara/lib/libdrm/xf86drm.h
C xenocara/lib/libdrm/configure
C xenocara/lib/libdrm/Makefile.in
U xenocara/lib/libdrm/xf86drmRandom.h
U xenocara/lib/libdrm/xf86drmHash.h
C xenocara/lib/libdrm/libdrm_macros.h
C xenocara/lib/libdrm/build-aux/config.guess
C xenocara/lib/libdrm/build-aux/install-sh
C xenocara/lib/libdrm/build-aux/config.sub
C xenocara/lib/libdrm/build-aux/depcomp
U xenocara/lib/libdrm/build-aux/compile
U xenocara/lib/libdrm/build-aux/test-driver
C xenocara/lib/libdrm/build-aux/ltmain.sh
C xenocara/lib/libdrm/build-aux/missing
U xenocara/lib/libdrm/tegra/tegra.c
U xenocara/lib/libdrm/tegra/tegra-symbol-check
U xenocara/lib/libdrm/tegra/tegra.h
U xenocara/lib/libdrm/tegra/libdrm_tegra.pc.in
U xenocara/lib/libdrm/tegra/meson.build
U xenocara/lib/libdrm/tegra/Makefile.am
U xenocara/lib/libdrm/tegra/private.h
C xenocara/lib/libdrm/tegra/Makefile.in
U xenocara/lib/libdrm/amdgpu/amdgpu_cs.c
U xenocara/lib/libdrm/amdgpu/amdgpu_internal.h
U xenocara/lib/libdrm/amdgpu/amdgpu-symbol-check
U xenocara/lib/libdrm/amdgpu/amdgpu_asic_id.c
U xenocara/lib/libdrm/amdgpu/amdgpu_vamgr.c
C xenocara/lib/libdrm/amdgpu/amdgpu_bo.c
U xenocara/lib/libdrm/amdgpu/Makefile.sources
U xenocara/lib/libdrm/amdgpu/libdrm_amdgpu.pc.in
U xenocara/lib/libdrm/amdgpu/meson.build
U xenocara/lib/libdrm/amdgpu/Makefile.am
U xenocara/lib/libdrm/amdgpu/amdgpu_device.c
U xenocara/lib/libdrm/amdgpu/amdgpu_gpu_info.c
C xenocara/lib/libdrm/amdgpu/Makefile.in
U xenocara/lib/libdrm/amdgpu/handle_table.c
U xenocara/lib/libdrm/amdgpu/handle_table.h
U xenocara/lib/libdrm/amdgpu/amdgpu.h
U xenocara/lib/libdrm/amdgpu/amdgpu_vm.c
U xenocara/lib/libdrm/freedreno/freedreno_device.c
U xenocara/lib/libdrm/freedreno/freedreno_bo.c
U xenocara/lib/libdrm/freedreno/freedreno_priv.h
U xenocara/lib/libdrm/freedreno/freedreno-symbol-check
U xenocara/lib/libdrm/freedreno/freedreno_bo_cache.c
U xenocara/lib/libdrm/freedreno/Makefile.sources
U xenocara/lib/libdrm/freedreno/freedreno_ringbuffer.h
U xenocara/lib/libdrm/freedreno/libdrm_freedreno.pc.in
U xenocara/lib/libdrm/freedreno/freedreno_ringbuffer.c
U xenocara/lib/libdrm/freedreno/meson.build
U xenocara/lib/libdrm/freedreno/Makefile.am
C xenocara/lib/libdrm/freedreno/Makefile.in
U xenocara/lib/libdrm/freedreno/freedreno_drmif.h
U xenocara/lib/libdrm/freedreno/freedreno_pipe.c
U xenocara/lib/libdrm/freedreno/msm/msm_bo.c
U xenocara/lib/libdrm/freedreno/msm/msm_pipe.c
U xenocara/lib/libdrm/freedreno/msm/msm_device.c
U xenocara/lib/libdrm/freedreno/msm/msm_priv.h
U xenocara/lib/libdrm/freedreno/msm/msm_ringbuffer.c
U xenocara/lib/libdrm/freedreno/kgsl/kgsl_device.c
U xenocara/lib/libdrm/freedreno/kgsl/msm_kgsl.h
U xenocara/lib/libdrm/freedreno/kgsl/kgsl_priv.h
U xenocara/lib/libdrm/freedreno/kgsl/kgsl_bo.c
U xenocara/lib/libdrm/freedreno/kgsl/kgsl_drm.h
U xenocara/lib/libdrm/freedreno/kgsl/kgsl_ringbuffer.c
U xenocara/lib/libdrm/freedreno/kgsl/kgsl_pipe.c
U xenocara/lib/libdrm/include/drm/README
U xenocara/lib/libdrm/include/drm/i915_drm.h
C xenocara/lib/libdrm/include/drm/drm.h
U xenocara/lib/libdrm/include/drm/qxl_drm.h
U xenocara/lib/libdrm/include/drm/sis_drm.h
U xenocara/lib/libdrm/include/drm/virtgpu_drm.h
U xenocara/lib/libdrm/include/drm/mach64_drm.h
U xenocara/lib/libdrm/include/drm/drm_mode.h
U xenocara/lib/libdrm/include/drm/mga_drm.h
U xenocara/lib/libdrm/include/drm/savage_drm.h
U xenocara/lib/libdrm/include/drm/nouveau_drm.h
U xenocara/lib/libdrm/include/drm/amdgpu_drm.h
U xenocara/lib/libdrm/include/drm/r128_drm.h
U xenocara/lib/libdrm/include/drm/vmwgfx_drm.h
U xenocara/lib/libdrm/include/drm/via_drm.h
U xenocara/lib/libdrm/include/drm/drm_sarea.h
U xenocara/lib/libdrm/include/drm/msm_drm.h
U xenocara/lib/libdrm/include/drm/tegra_drm.h
U xenocara/lib/libdrm/include/drm/drm_fourcc.h
U xenocara/lib/libdrm/include/drm/radeon_drm.h
U xenocara/lib/libdrm/include/drm/vc4_drm.h
U xenocara/lib/libdrm/etnaviv/etnaviv_gpu.c
U xenocara/lib/libdrm/etnaviv/etnaviv_bo.c
U xenocara/lib/libdrm/etnaviv/etnaviv-symbol-check
U xenocara/lib/libdrm/etnaviv/etnaviv_priv.h
U xenocara/lib/libdrm/etnaviv/etnaviv_device.c
U xenocara/lib/libdrm/etnaviv/etnaviv_drm.h
U xenocara/lib/libdrm/etnaviv/libdrm_etnaviv.pc.in
U xenocara/lib/libdrm/etnaviv/etnaviv_perfmon.c
U xenocara/lib/libdrm/etnaviv/etnaviv_cmd_stream.c
U xenocara/lib/libdrm/etnaviv/Makefile.sources
U xenocara/lib/libdrm/etnaviv/meson.build
U xenocara/lib/libdrm/etnaviv/etnaviv_bo_cache.c
U xenocara/lib/libdrm/etnaviv/Makefile.am
U xenocara/lib/libdrm/etnaviv/etnaviv_pipe.c
C xenocara/lib/libdrm/etnaviv/Makefile.in
U xenocara/lib/libdrm/etnaviv/etnaviv_drmif.h
C xenocara/lib/libdrm/m4/ltversion.m4
C xenocara/lib/libdrm/m4/libtool.m4
C xenocara/lib/libdrm/m4/lt~obsolete.m4
C xenocara/lib/libdrm/m4/ltoptions.m4
C xenocara/lib/libdrm/m4/ltsugar.m4
U xenocara/lib/libdrm/omap/omap-symbol-check
U xenocara/lib/libdrm/omap/libdrm_omap.pc.in
U xenocara/lib/libdrm/omap/omap_drmif.h
U xenocara/lib/libdrm/omap/omap_drm.c
U xenocara/lib/libdrm/omap/meson.build
U xenocara/lib/libdrm/omap/Makefile.am
C xenocara/lib/libdrm/omap/Makefile.in
U xenocara/lib/libdrm/omap/omap_drm.h
U xenocara/lib/libdrm/radeon/radeon_cs_gem.h
U xenocara/lib/libdrm/radeon/radeon_cs.c
U xenocara/lib/libdrm/radeon/radeon_cs_int.h
U xenocara/lib/libdrm/radeon/radeon_surface.h
U xenocara/lib/libdrm/radeon/radeon_bo_gem.c
U xenocara/lib/libdrm/radeon/radeon_bo_int.h
U xenocara/lib/libdrm/radeon/radeon_cs_space.c
U xenocara/lib/libdrm/radeon/radeon_surface.c
U xenocara/lib/libdrm/radeon/Makefile.sources
U xenocara/lib/libdrm/radeon/meson.build
U xenocara/lib/libdrm/radeon/radeon_bo_gem.h
U xenocara/lib/libdrm/radeon/Makefile.am
U xenocara/lib/libdrm/radeon/r600_pci_ids.h
U xenocara/lib/libdrm/radeon/radeon_cs.h
U xenocara/lib/libdrm/radeon/bof.h
C xenocara/lib/libdrm/radeon/Makefile.in
U xenocara/lib/libdrm/radeon/radeon_bo.h
U xenocara/lib/libdrm/radeon/radeon_bo.c
U xenocara/lib/libdrm/radeon/libdrm_radeon.pc.in
U xenocara/lib/libdrm/radeon/radeon-symbol-check
U xenocara/lib/libdrm/radeon/bof.c
U xenocara/lib/libdrm/radeon/radeon_cs_gem.c
U xenocara/lib/libdrm/vc4/vc4_qpu_defines.h
U xenocara/lib/libdrm/vc4/Makefile.sources
U xenocara/lib/libdrm/vc4/libdrm_vc4.pc.in
U xenocara/lib/libdrm/vc4/meson.build
U xenocara/lib/libdrm/vc4/Makefile.am
C xenocara/lib/libdrm/vc4/Makefile.in
U xenocara/lib/libdrm/vc4/vc4_packet.h
U xenocara/lib/libdrm/nouveau/bufctx.c
U xenocara/lib/libdrm/nouveau/nouveau.h
U xenocara/lib/libdrm/nouveau/abi16.c
U xenocara/lib/libdrm/nouveau/nouveau-symbol-check
U xenocara/lib/libdrm/nouveau/libdrm_nouveau.pc.in
U xenocara/lib/libdrm/nouveau/pushbuf.c
U xenocara/lib/libdrm/nouveau/Makefile.sources
U xenocara/lib/libdrm/nouveau/meson.build
U xenocara/lib/libdrm/nouveau/Makefile.am
U xenocara/lib/libdrm/nouveau/private.h
U xenocara/lib/libdrm/nouveau/nouveau.c
C xenocara/lib/libdrm/nouveau/Makefile.in
U xenocara/lib/libdrm/nouveau/nvif/ioctl.h
U xenocara/lib/libdrm/nouveau/nvif/if0002.h
U xenocara/lib/libdrm/nouveau/nvif/cl0080.h
U xenocara/lib/libdrm/nouveau/nvif/if0003.h
U xenocara/lib/libdrm/nouveau/nvif/class.h
U xenocara/lib/libdrm/nouveau/nvif/cl9097.h
U xenocara/lib/libdrm/nouveau/nvif/unpack.h
U xenocara/lib/libdrm/intel/intel_bufmgr_gem.c
U xenocara/lib/libdrm/intel/uthash.h
C xenocara/lib/libdrm/intel/i915_pciids.h
U xenocara/lib/libdrm/intel/intel_decode.c
C xenocara/lib/libdrm/intel/intel_chipset.h
U xenocara/lib/libdrm/intel/intel_chipset.c
U xenocara/lib/libdrm/intel/Makefile.sources
U xenocara/lib/libdrm/intel/meson.build
U xenocara/lib/libdrm/intel/Makefile.am
U xenocara/lib/libdrm/intel/libdrm_intel.pc.in
U xenocara/lib/libdrm/intel/intel_bufmgr.h
U xenocara/lib/libdrm/intel/intel_bufmgr_priv.h
C xenocara/lib/libdrm/intel/Makefile.in
U xenocara/lib/libdrm/intel/intel_debug.h
U xenocara/lib/libdrm/intel/mm.h
U xenocara/lib/libdrm/intel/intel_bufmgr.c
U xenocara/lib/libdrm/intel/test_decode.c
U xenocara/lib/libdrm/intel/mm.c
U xenocara/lib/libdrm/intel/intel_aub.h
U xenocara/lib/libdrm/intel/intel-symbol-check
U xenocara/lib/libdrm/intel/intel_bufmgr_fake.c
U xenocara/lib/libdrm/intel/tests/gen4-3d.batch-ref.txt
U xenocara/lib/libdrm/intel/tests/gen4-3d.batch
U xenocara/lib/libdrm/intel/tests/gen5-3d.batch.sh
U xenocara/lib/libdrm/intel/tests/gen6-3d.batch
U xenocara/lib/libdrm/intel/tests/gen7-2d-copy.batch.sh
U xenocara/lib/libdrm/intel/tests/gen7-3d.batch.sh
U xenocara/lib/libdrm/intel/tests/gen7-3d.batch
U xenocara/lib/libdrm/intel/tests/gen6-3d.batch-ref.txt
U xenocara/lib/libdrm/intel/tests/gm45-3d.batch.sh
U xenocara/lib/libdrm/intel/tests/gen5-3d.batch-ref.txt
U xenocara/lib/libdrm/intel/tests/gm45-3d.batch
U xenocara/lib/libdrm/intel/tests/gen7-3d.batch-ref.txt
U xenocara/lib/libdrm/intel/tests/gen7-2d-copy.batch-ref.txt
U xenocara/lib/libdrm/intel/tests/gen5-3d.batch
U xenocara/lib/libdrm/intel/tests/gen7-2d-copy.batch
U xenocara/lib/libdrm/intel/tests/test-batch.sh
U xenocara/lib/libdrm/intel/tests/gen6-3d.batch.sh
U xenocara/lib/libdrm/intel/tests/gm45-3d.batch-ref.txt
U xenocara/lib/libdrm/intel/tests/gen4-3d.batch.sh
U xenocara/lib/libdrm/data/meson.build
U xenocara/lib/libdrm/data/Makefile.am
U xenocara/lib/libdrm/data/amdgpu.ids
C xenocara/lib/libdrm/data/Makefile.in
U xenocara/lib/libdrm/exynos/exynos_fimg2d.c
U xenocara/lib/libdrm/exynos/fimg2d_reg.h
U xenocara/lib/libdrm/exynos/exynos_drm.c
U xenocara/lib/libdrm/exynos/exynos-symbol-check
U xenocara/lib/libdrm/exynos/meson.build
U xenocara/lib/libdrm/exynos/Makefile.am
C xenocara/lib/libdrm/exynos/Makefile.in
U xenocara/lib/libdrm/exynos/exynos_drmif.h
U xenocara/lib/libdrm/exynos/exynos_drm.h
U xenocara/lib/libdrm/exynos/libdrm_exynos.pc.in
U xenocara/lib/libdrm/exynos/exynos_fimg2d.h
U xenocara/lib/libdrm/libkms/libkms.h
U xenocara/lib/libdrm/libkms/vmwgfx.c
U xenocara/lib/libdrm/libkms/libkms.pc.in
U xenocara/lib/libdrm/libkms/intel.c
U xenocara/lib/libdrm/libkms/exynos.c
U xenocara/lib/libdrm/libkms/linux.c
U xenocara/lib/libdrm/libkms/radeon.c
U xenocara/lib/libdrm/libkms/dumb.c
U xenocara/lib/libdrm/libkms/Makefile.sources
U xenocara/lib/libdrm/libkms/api.c
U xenocara/lib/libdrm/libkms/meson.build
U xenocara/lib/libdrm/libkms/Makefile.am
U xenocara/lib/libdrm/libkms/nouveau.c
U xenocara/lib/libdrm/libkms/internal.h
U xenocara/lib/libdrm/libkms/kms-symbol-check
C xenocara/lib/libdrm/libkms/Makefile.in
U xenocara/lib/libdrm/tests/hash.c
U xenocara/lib/libdrm/tests/drmdevice.c
U xenocara/lib/libdrm/tests/drmsl.c
U xenocara/lib/libdrm/tests/meson.build
U xenocara/lib/libdrm/tests/Makefile.am
C xenocara/lib/libdrm/tests/Makefile.in
U xenocara/lib/libdrm/tests/random.c
U xenocara/lib/libdrm/tests/tegra/openclose.c
U xenocara/lib/libdrm/tests/tegra/meson.build
U xenocara/lib/libdrm/tests/tegra/Makefile.am
C xenocara/lib/libdrm/tests/tegra/Makefile.in
U xenocara/lib/libdrm/tests/kmstest/meson.build
U xenocara/lib/libdrm/tests/kmstest/Makefile.am
U xenocara/lib/libdrm/tests/kmstest/main.c
C xenocara/lib/libdrm/tests/kmstest/Makefile.in
U xenocara/lib/libdrm/tests/amdgpu/amdgpu_test.h
U xenocara/lib/libdrm/tests/amdgpu/bo_tests.c
U xenocara/lib/libdrm/tests/amdgpu/decode_messages.h
U xenocara/lib/libdrm/tests/amdgpu/amdgpu_test.c
U xenocara/lib/libdrm/tests/amdgpu/frame.h
U xenocara/lib/libdrm/tests/amdgpu/vce_tests.c
U xenocara/lib/libdrm/tests/amdgpu/deadlock_tests.c
U xenocara/lib/libdrm/tests/amdgpu/uvd_enc_tests.c
N xenocara/lib/libdrm/tests/amdgpu/syncobj_tests.c
U xenocara/lib/libdrm/tests/amdgpu/basic_tests.c
U xenocara/lib/libdrm/tests/amdgpu/meson.build
U xenocara/lib/libdrm/tests/amdgpu/vcn_tests.c
U xenocara/lib/libdrm/tests/amdgpu/cs_tests.c
U xenocara/lib/libdrm/tests/amdgpu/Makefile.am
U xenocara/lib/libdrm/tests/amdgpu/uve_ib.h
C xenocara/lib/libdrm/tests/amdgpu/Makefile.in
U xenocara/lib/libdrm/tests/amdgpu/ras_tests.c
U xenocara/lib/libdrm/tests/amdgpu/vce_ib.h
U xenocara/lib/libdrm/tests/amdgpu/vm_tests.c
U xenocara/lib/libdrm/tests/kms/libkms-test.h
U xenocara/lib/libdrm/tests/kms/kms-steal-crtc.c
U xenocara/lib/libdrm/tests/kms/libkms-test-crtc.c
U xenocara/lib/libdrm/tests/kms/libkms-test-plane.c
U xenocara/lib/libdrm/tests/kms/kms-universal-planes.c
U xenocara/lib/libdrm/tests/kms/libkms-test-device.c
U xenocara/lib/libdrm/tests/kms/libkms-test-screen.c
U xenocara/lib/libdrm/tests/kms/meson.build
U xenocara/lib/libdrm/tests/kms/Makefile.am
C xenocara/lib/libdrm/tests/kms/Makefile.in
U xenocara/lib/libdrm/tests/kms/libkms-test-framebuffer.c
U xenocara/lib/libdrm/tests/etnaviv/write_bmp.c
U xenocara/lib/libdrm/tests/etnaviv/cmdstream.xml.h
U xenocara/lib/libdrm/tests/etnaviv/etnaviv_bo_cache_test.c
U xenocara/lib/libdrm/tests/etnaviv/etnaviv_2d_test.c
U xenocara/lib/libdrm/tests/etnaviv/write_bmp.h
U xenocara/lib/libdrm/tests/etnaviv/state.xml.h
U xenocara/lib/libdrm/tests/etnaviv/etnaviv_cmd_stream_test.c
U xenocara/lib/libdrm/tests/etnaviv/meson.build
U xenocara/lib/libdrm/tests/etnaviv/Makefile.am
C xenocara/lib/libdrm/tests/etnaviv/Makefile.in
U xenocara/lib/libdrm/tests/etnaviv/state_2d.xml.h
U xenocara/lib/libdrm/tests/vbltest/vbltest.c
U xenocara/lib/libdrm/tests/vbltest/meson.build
U xenocara/lib/libdrm/tests/vbltest/Makefile.am
C xenocara/lib/libdrm/tests/vbltest/Makefile.in
U xenocara/lib/libdrm/tests/modetest/buffers.h
U xenocara/lib/libdrm/tests/modetest/modetest.c
U xenocara/lib/libdrm/tests/modetest/cursor.c
U xenocara/lib/libdrm/tests/modetest/buffers.c
U xenocara/lib/libdrm/tests/modetest/Makefile.sources
U xenocara/lib/libdrm/tests/modetest/meson.build
U xenocara/lib/libdrm/tests/modetest/Makefile.am
U xenocara/lib/libdrm/tests/modetest/cursor.h
C xenocara/lib/libdrm/tests/modetest/Makefile.in
U xenocara/lib/libdrm/tests/radeon/rbo.h
U xenocara/lib/libdrm/tests/radeon/rbo.c
U xenocara/lib/libdrm/tests/radeon/radeon_ttm.c
U xenocara/lib/libdrm/tests/radeon/meson.build
U xenocara/lib/libdrm/tests/radeon/Makefile.am
C xenocara/lib/libdrm/tests/radeon/Makefile.in
U xenocara/lib/libdrm/tests/nouveau/threaded.c
U xenocara/lib/libdrm/tests/nouveau/meson.build
U xenocara/lib/libdrm/tests/nouveau/Makefile.am
C xenocara/lib/libdrm/tests/nouveau/Makefile.in
U xenocara/lib/libdrm/tests/util/format.h
U xenocara/lib/libdrm/tests/util/pattern.h
U xenocara/lib/libdrm/tests/util/pattern.c
U xenocara/lib/libdrm/tests/util/Makefile.sources
U xenocara/lib/libdrm/tests/util/meson.build
U xenocara/lib/libdrm/tests/util/Makefile.am
U xenocara/lib/libdrm/tests/util/common.h
U xenocara/lib/libdrm/tests/util/format.c
C xenocara/lib/libdrm/tests/util/Makefile.in
U xenocara/lib/libdrm/tests/util/kms.h
U xenocara/lib/libdrm/tests/util/kms.c
U xenocara/lib/libdrm/tests/proptest/proptest.c
U xenocara/lib/libdrm/tests/proptest/Makefile.sources
U xenocara/lib/libdrm/tests/proptest/meson.build
U xenocara/lib/libdrm/tests/proptest/Makefile.am
C xenocara/lib/libdrm/tests/proptest/Makefile.in
U xenocara/lib/libdrm/tests/exynos/exynos_fimg2d_perf.c
U xenocara/lib/libdrm/tests/exynos/meson.build
U xenocara/lib/libdrm/tests/exynos/exynos_fimg2d_event.c
U xenocara/lib/libdrm/tests/exynos/Makefile.am
U xenocara/lib/libdrm/tests/exynos/exynos_fimg2d_test.c
C xenocara/lib/libdrm/tests/exynos/Makefile.in
U xenocara/lib/libdrm/tests/modeprint/modeprint.c
U xenocara/lib/libdrm/tests/modeprint/meson.build
U xenocara/lib/libdrm/tests/modeprint/Makefile.am
C xenocara/lib/libdrm/tests/modeprint/Makefile.in
U xenocara/lib/libdrm/man/drm.xml
U xenocara/lib/libdrm/man/drmAvailable.xml
U xenocara/lib/libdrm/man/drm-memory.xml
U xenocara/lib/libdrm/man/meson.build
U xenocara/lib/libdrm/man/drmHandleEvent.xml
U xenocara/lib/libdrm/man/Makefile.am
U xenocara/lib/libdrm/man/drm-kms.xml
C xenocara/lib/libdrm/man/Makefile.in
U xenocara/lib/libdrm/man/drmModeGetResources.xml
50 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jlibdrm:yesterday -jlibdrm xenocara/lib/libdrm
