solve merge conflict

This commit is contained in:
IoIxD 2025-12-05 23:05:10 -07:00
commit 3f6a77f890
171 changed files with 730 additions and 926 deletions

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*!
* @file Mw/LowLevel/GDI.h
* @brief GDI Backend

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*!
* @file Mw/LowLevel/X11.h
* @brief X11 Backend
@ -34,6 +33,7 @@ struct _MwLLX11 {
XIC xic;
int top;
int toplevel;
int grabbed;
int force_render;