2daa8d422a
Conflicts: i3-config-wizard/main.c |
||
---|---|---|
.. | ||
atoms.xmacro | ||
cfgparse.l | ||
cfgparse.y | ||
main.c | ||
Makefile | ||
xcb.h |
2daa8d422a
Conflicts: i3-config-wizard/main.c |
||
---|---|---|
.. | ||
atoms.xmacro | ||
cfgparse.l | ||
cfgparse.y | ||
main.c | ||
Makefile | ||
xcb.h |