utf-conv.c
1.81 KB
-
Merge remote-tracking branch 'scottjg/fix-mingw32' into development · cd58c15cConflicts: src/netops.c src/netops.h src/transports/http.c tests-clar/clar
Vicent Martí committed
Conflicts: src/netops.c src/netops.h src/transports/http.c tests-clar/clar