Alexander Radkov 1af188c778 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # bin/freetype6.dll # bin/zlib1.dll		2017-02-10 11:35:25 +09:00
..
example.bat	V1.4: Overlapping contours, cubic distance fix, guessorder	2017-02-09 22:44:37 +01:00