Sen Huang 7ce891870c Fix merge conflicts

2019-11-05 15:51:25 -05:00

..

zstd.rc

Windows resources moved to programs/windres/

2016-10-25 10:34:41 +02:00

zstd.vcxproj

Fix merge conflicts

2019-11-05 15:51:25 -05:00