CVS: cvs.openbsd.org: xenocara

[Jonathan Gray]

CVSROOT:        /cvs
Module name:    xenocara
Changes by:     j...@cvs.openbsd.org    2020/09/03 02:36:23

Modified files:
        lib/mesa/src/util: os_misc.c u_thread.h 
        lib/mesa/src/vulkan/wsi: wsi_common_x11.c 

Log message:
correct merge errors