Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Sravan Balaji
2022-07-05 20:40:31 -04:00
22 changed files with 501 additions and 390 deletions

View File

@@ -48,7 +48,7 @@ YAJLINC = -I/usr/include/yajl
# Uncomment this for the swallow patch / SWALLOW_PATCH
XCBLIBS = -lX11-xcb -lxcb -lxcb-res
# This is needed for the winicon patch / BAR_WINICON_PATCH
# This is needed for the winicon and tagpreview patches / BAR_WINICON_PATCH / BAR_TAGPREVIEW_PATCH
#IMLIB2LIBS = -lImlib2
# includes and libs