christos 6db8c6e988 merge conflicts		2017-01-10 01:27:41 +00:00
..
DLL_FAQ.txt
Makefile.bor
Makefile.gcc
Makefile.msc
README-WIN32.txt
VisualC.txt
zlib1.rc
zlib.def