# HG changeset patch
# User sheepluva
# Date 1593953624 -7200
# Node ID 74ede02bc8822558ba34dfb547d626792a9a634a
# Parent  dc965b82ed1341c8dae25e1662adc67193b43600# Parent  b3c9f5463ceecdd8bef211540104db1472cdb3aa
[NOOP] Merge branch ui-scaling (with backports) into default to avoid future merging issues

diff -r dc965b82ed13 -r 74ede02bc882 ChangeLog.txt
diff -r dc965b82ed13 -r 74ede02bc882 hedgewars/uChat.pas